aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2024-04-08 21:18:32 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2024-04-08 21:18:32 +0000
commitad52760220c04cebeb8316cc78076304bce91bae (patch)
tree80859710caf20779b57681897aeb0da7832882fa
parente28a98569c078434610056d0fd1e160f983fbc48 (diff)
downloadports-ad52760220c04cebeb8316cc78076304bce91bae.tar.gz
ports-ad52760220c04cebeb8316cc78076304bce91bae.zip
www/firefox: update to 125.0 (rc1)
-rw-r--r--www/firefox/Makefile6
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/firefox/files/patch-bug162856732
-rw-r--r--www/firefox/files/patch-bug1876366201
-rw-r--r--www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp23
-rw-r--r--www/firefox/files/patch-libwebrtc-generated5594
-rw-r--r--www/firefox/files/patch-wayland-proxy15
7 files changed, 1608 insertions, 4269 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index c31f6315d761..0fcdbf5b6b45 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 124.0.2
+DISTVERSION= 125.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -11,12 +11,12 @@ COMMENT= Web browser based on the browser portion of Mozilla
WWW= https://www.mozilla.com/firefox
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
- nss>=3.98:security/nss \
+ nss>=3.99:security/nss \
icu>=73.1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=8.3.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
- png>=1.6.39:graphics/png \
+ png>=1.6.43:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
libvpx>=1.14.0:multimedia/libvpx \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 02e740f96ccf..7dfe49732726 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711995792
-SHA256 (firefox-124.0.2.source.tar.xz) = a6526d3540e19c8875cb7364e4490436c189478d375c4cb5216b0414e4b2d91c
-SIZE (firefox-124.0.2.source.tar.xz) = 555223648
+TIMESTAMP = 1712608770
+SHA256 (firefox-125.0.source.tar.xz) = beeef124a0808ca2e71b84b45251de42c4b1a818467505b8778935df1d829b19
+SIZE (firefox-125.0.source.tar.xz) = 545906816
diff --git a/www/firefox/files/patch-bug1628567 b/www/firefox/files/patch-bug1628567
deleted file mode 100644
index 003ba36d3ad1..000000000000
--- a/www/firefox/files/patch-bug1628567
+++ /dev/null
@@ -1,32 +0,0 @@
-Don't pass --target when CC/CXX contains clang
-
-diff --git third_party/rust/cc/src/lib.rs third_party/rust/cc/src/lib.rs
-index 8cafd2a..f40b746 100644
---- third_party/rust/cc/src/lib.rs
-+++ third_party/rust/cc/src/lib.rs
-@@ -2796,24 +2796,7 @@ impl Tool {
- }
-
- fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
-- // Try to detect family of the tool from its name, falling back to Gnu.
-- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
-- if fname.contains("clang-cl") {
-- ToolFamily::Msvc { clang_cl: true }
-- } else if fname.ends_with("cl") || fname == "cl.exe" {
-- ToolFamily::Msvc { clang_cl: false }
-- } else if fname.contains("clang") {
-- match clang_driver {
-- Some("cl") => ToolFamily::Msvc { clang_cl: true },
-- _ => ToolFamily::Clang,
-- }
-- } else {
-- ToolFamily::Gnu
-- }
-- } else {
-- ToolFamily::Gnu
-- };
--
-+ let family = ToolFamily::Gnu;
- Tool {
- path: path,
- cc_wrapper_path: None,
diff --git a/www/firefox/files/patch-bug1876366 b/www/firefox/files/patch-bug1876366
index a6f39ffabab8..78483c3fbab7 100644
--- a/www/firefox/files/patch-bug1876366
+++ b/www/firefox/files/patch-bug1876366
@@ -1,188 +1,23 @@
-commit 54d21b7398dc1a8ff22a987c660d400347b144a9
+commit 46a89fb0319d673b3139a068e3d89aed9f44fc16
Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-Date: Sun Feb 11 19:11:15 2024 +0100
- Bug 1876366: many X11 cursors stopped working
+ use gdk legacy cursor interface by default
- revert switch to newer gdk interface, as it broke cursor shape
- switching and living with the default cursor only is no fun.
-
- Revert "Bug 1872961 [Linux] Use pointer cursor for hyperlinks r=emilio"
-
- This reverts commit 0574d0cdc438e4b0ce588f1652af802a0357f255.
-
- Revert "Bug 1871863 - Port from GdkCursorType to gdk_cursor_new_from_name. r=rmader,stransky"
-
- This reverts commit 5dfa42970a9577f0ac4e0992d9ec58c691e9bef6.
+ Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=1876366#c16
+ hints that we could re-test this once we have GTK 3.24.42 (with the
+ now-current gtk3-3.24.41 the original problem is still reproducable,
+ but toggling this flag does fix it for me)
-diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
-index a011dcc51fdb..28100db36d89 100644
---- widget/gtk/nsWindow.cpp
-+++ widget/gtk/nsWindow.cpp
-@@ -7797,53 +7797,61 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) {
-
- GdkDisplay* defaultDisplay = gdk_display_get_default();
-
-+ // The strategy here is to use standard GDK cursors, and, if not available,
-+ // load by standard name with gdk_cursor_new_from_name.
-+ // Spec is here: http://www.freedesktop.org/wiki/Specifications/cursor-spec/
- switch (aCursor) {
- case eCursor_standard:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "default");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_LEFT_PTR);
- break;
- case eCursor_wait:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "wait");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_WATCH);
- break;
- case eCursor_select:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "text");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_XTERM);
- break;
- case eCursor_hyperlink:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "pointer");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_HAND2);
- break;
- case eCursor_n_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "n-resize");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_TOP_SIDE);
- break;
- case eCursor_s_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "s-resize");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_BOTTOM_SIDE);
- break;
- case eCursor_w_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "w-resize");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_LEFT_SIDE);
- break;
- case eCursor_e_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "e-resize");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_RIGHT_SIDE);
- break;
- case eCursor_nw_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "nw-resize");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_TOP_LEFT_CORNER);
- break;
- case eCursor_se_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "se-resize");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_BOTTOM_RIGHT_CORNER);
- break;
- case eCursor_ne_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "ne-resize");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_TOP_RIGHT_CORNER);
- break;
- case eCursor_sw_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "sw-resize");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_BOTTOM_LEFT_CORNER);
- break;
- case eCursor_crosshair:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "crosshair");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_CROSSHAIR);
- break;
- case eCursor_move:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "move");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_FLEUR);
- break;
- case eCursor_help:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "help");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_QUESTION_ARROW);
- break;
-- case eCursor_copy:
-+ case eCursor_copy: // CSS3
- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "copy");
- if (!gdkcursor) newType = MOZ_CURSOR_COPY;
- break;
-@@ -7856,14 +7864,18 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) {
- if (!gdkcursor) newType = MOZ_CURSOR_CONTEXT_MENU;
- break;
- case eCursor_cell:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "cell");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_PLUS);
- break;
-+ // Those two aren’t standardized. Trying both KDE’s and GNOME’s names
- case eCursor_grab:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "grab");
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "openhand");
- if (!gdkcursor) newType = MOZ_CURSOR_HAND_GRAB;
- break;
- case eCursor_grabbing:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "grabbing");
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "closedhand");
-+ if (!gdkcursor) {
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "grabbing");
-+ }
- if (!gdkcursor) newType = MOZ_CURSOR_HAND_GRABBING;
- break;
- case eCursor_spinning:
-@@ -7880,6 +7892,9 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) {
- break;
- case eCursor_not_allowed:
- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "not-allowed");
-+ if (!gdkcursor) { // nonstandard, yet common
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "crossed_circle");
-+ }
- if (!gdkcursor) newType = MOZ_CURSOR_NOT_ALLOWED;
- break;
- case eCursor_no_drop:
-@@ -7900,35 +7915,46 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) {
- }
- break;
- case eCursor_all_scroll:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "move");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_FLEUR);
- break;
- case eCursor_nesw_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "nesw-resize");
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "size_bdiag");
- if (!gdkcursor) newType = MOZ_CURSOR_NESW_RESIZE;
- break;
- case eCursor_nwse_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "nwse-resize");
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "size_fdiag");
- if (!gdkcursor) newType = MOZ_CURSOR_NWSE_RESIZE;
- break;
- case eCursor_ns_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "ns-resize");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_V_DOUBLE_ARROW);
- break;
- case eCursor_ew_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "ew-resize");
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_H_DOUBLE_ARROW);
- break;
-+ // Here, two better fitting cursors exist in some cursor themes. Try those
-+ // first
- case eCursor_row_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "row-resize");
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "split_v");
-+ if (!gdkcursor) {
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_V_DOUBLE_ARROW);
-+ }
- break;
- case eCursor_col_resize:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "col-resize");
-+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "split_h");
-+ if (!gdkcursor) {
-+ gdkcursor =
-+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_H_DOUBLE_ARROW);
-+ }
- break;
- case eCursor_none:
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "none");
-- if (!gdkcursor) newType = MOZ_CURSOR_NONE;
-+ newType = MOZ_CURSOR_NONE;
- break;
- default:
- NS_ASSERTION(aCursor, "Invalid cursor type");
-- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "default");
-+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_LEFT_PTR);
- break;
- }
+diff --git modules/libpref/init/StaticPrefList.yaml modules/libpref/init/StaticPrefList.yaml
+index 835450712a12..f2249006c36d 100644
+--- modules/libpref/init/StaticPrefList.yaml
++++ modules/libpref/init/StaticPrefList.yaml
+@@ -16070,7 +16070,7 @@
+ # Whether to use gtk legacy cursor API.
+ - name: widget.gtk.legacy-cursors.enabled
+ type: bool
+- value: false
++ value: true
+ mirror: always
+ # Whether to use gtk high contrast themes to disable content styling like on
diff --git a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
deleted file mode 100644
index 6dc197d9455e..000000000000
--- a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-Enable FLAC on platforms without ffvpx like powerpc*
-
---- dom/media/flac/FlacDecoder.cpp.orig 2021-04-15 19:44:28 UTC
-+++ dom/media/flac/FlacDecoder.cpp
-@@ -7,6 +7,7 @@
- #include "FlacDecoder.h"
- #include "MediaContainerType.h"
- #include "mozilla/StaticPrefs_media.h"
-+#include "PDMFactory.h"
-
- namespace mozilla {
-
-@@ -14,6 +15,10 @@ namespace mozilla {
- bool FlacDecoder::IsEnabled() {
- #ifdef MOZ_FFVPX
- return StaticPrefs::media_flac_enabled();
-+#elif defined(MOZ_FFMPEG)
-+ RefPtr<PDMFactory> platform = new PDMFactory();
-+ return StaticPrefs::media_flac_enabled() &&
-+ !platform->SupportsMimeType("audio/flac"_ns).isEmpty();
- #else
- return false;
- #endif
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 73b01ec37c0c..caec639c4c69 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,10 +1,10 @@
-commit dc3c9060f191382e543c26328f99a06f10176309
+commit 01127134cdeb090ebf87ffdf452c586ca3a3d838
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
- regenerate FreeBSD libwebrtc patch for Firefox 124
+ regenerate FreeBSD libwebrtc patch for Firefox 125
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 c06f943d1b75..642f867db664 100644
+index b0671b5d4adb..642f867db664 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29,7 +29,7 @@ index c06f943d1b75..642f867db664 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -179,7 +179,6 @@ index c06f943d1b75..642f867db664 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -189,10 +188,6 @@ index c06f943d1b75..642f867db664 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -220,7 +215,7 @@ index c06f943d1b75..642f867db664 100644
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index e89811c36f3a..935f8560bd05 100644
+index e090bcdfc55c..935f8560bd05 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -358,7 +353,7 @@ index e89811c36f3a..935f8560bd05 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -390,16 +385,9 @@ index e89811c36f3a..935f8560bd05 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -418,7 +406,7 @@ index e89811c36f3a..935f8560bd05 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index 5e31fd1734a6..8512989cc3ea 100644
+index 6a2d55b776db..8512989cc3ea 100644
--- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
+++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -564,7 +552,7 @@ index 5e31fd1734a6..8512989cc3ea 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -596,16 +584,9 @@ index 5e31fd1734a6..8512989cc3ea 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -624,7 +605,7 @@ index 5e31fd1734a6..8512989cc3ea 100644
-
Library("async_dns_resolver_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index 4b9691091908..d217e83eb683 100644
+index ee6df1d36f53..d217e83eb683 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -649,7 +630,7 @@ index 4b9691091908..d217e83eb683 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -799,7 +780,6 @@ index 4b9691091908..d217e83eb683 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -809,10 +789,6 @@ index 4b9691091908..d217e83eb683 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -840,7 +816,7 @@ index 4b9691091908..d217e83eb683 100644
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index de044719ccf5..4e9cb792fd2e 100644
+index 0c3ce503ad9e..4e9cb792fd2e 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -866,7 +842,7 @@ index de044719ccf5..4e9cb792fd2e 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1027,7 +1003,6 @@ index de044719ccf5..4e9cb792fd2e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -1037,10 +1012,6 @@ index de044719ccf5..4e9cb792fd2e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1068,7 +1039,7 @@ index de044719ccf5..4e9cb792fd2e 100644
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index ca2c90ecfa0d..2fecbfa52bb7 100644
+index 1317ad89b0d7..2fecbfa52bb7 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1093,7 +1064,7 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1250,7 +1221,6 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -1260,10 +1230,6 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1291,7 +1257,7 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644
Library("audio_frame_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index 87847bb863f0..cdd13155790d 100644
+index e04682bee3fa..cdd13155790d 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1425,7 +1391,7 @@ index 87847bb863f0..cdd13155790d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1457,16 +1423,9 @@ index 87847bb863f0..cdd13155790d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1485,7 +1444,7 @@ index 87847bb863f0..cdd13155790d 100644
-
Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 27baf1a79656..d4a66ce81d9b 100644
+index c74637daa356..d4a66ce81d9b 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1630,7 +1589,7 @@ index 27baf1a79656..d4a66ce81d9b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1662,16 +1621,9 @@ index 27baf1a79656..d4a66ce81d9b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1690,7 +1642,7 @@ index 27baf1a79656..d4a66ce81d9b 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 6a5ce44f46f9..08b8d7df91dd 100644
+index eb9e4ec6697b..08b8d7df91dd 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1828,7 +1780,7 @@ index 6a5ce44f46f9..08b8d7df91dd 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1860,16 +1812,9 @@ index 6a5ce44f46f9..08b8d7df91dd 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -1888,7 +1833,7 @@ index 6a5ce44f46f9..08b8d7df91dd 100644
-
Library("echo_control_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 9ab87e6a0e84..0973b9bab0b3 100644
+index 9dcc9826de61..0973b9bab0b3 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1913,7 +1858,7 @@ index 9ab87e6a0e84..0973b9bab0b3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2070,7 +2015,6 @@ index 9ab87e6a0e84..0973b9bab0b3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -2080,10 +2024,6 @@ index 9ab87e6a0e84..0973b9bab0b3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2111,7 +2051,7 @@ index 9ab87e6a0e84..0973b9bab0b3 100644
Library("audio_decoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 0efa8c28a219..8e851ee1eac0 100644
+index b5c7fe8b37a8..8e851ee1eac0 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2136,7 +2076,7 @@ index 0efa8c28a219..8e851ee1eac0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2293,7 +2233,6 @@ index 0efa8c28a219..8e851ee1eac0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -2303,10 +2242,6 @@ index 0efa8c28a219..8e851ee1eac0 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2334,7 +2269,7 @@ index 0efa8c28a219..8e851ee1eac0 100644
Library("audio_encoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 6c8b6b3b2b89..acac009b8893 100644
+index 8eaebf875c3c..acac009b8893 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2359,7 +2294,7 @@ index 6c8b6b3b2b89..acac009b8893 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2516,7 +2451,6 @@ index 6c8b6b3b2b89..acac009b8893 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -2526,10 +2460,6 @@ index 6c8b6b3b2b89..acac009b8893 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2557,7 +2487,7 @@ index 6c8b6b3b2b89..acac009b8893 100644
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index f64e3e334075..edfab7737136 100644
+index 3ce5ad2d5d21..edfab7737136 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
@@ -12,13 +12,23 @@ AllowCompilerWarnings()
@@ -2584,7 +2514,7 @@ index f64e3e334075..edfab7737136 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2745,7 +2675,6 @@ index f64e3e334075..edfab7737136 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -2755,10 +2684,6 @@ index f64e3e334075..edfab7737136 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -2786,7 +2711,7 @@ index f64e3e334075..edfab7737136 100644
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index 6965c4298fe3..dd0e328737c6 100644
+index e8acc1186e04..dd0e328737c6 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
@@ -12,13 +12,23 @@ AllowCompilerWarnings()
@@ -2813,7 +2738,7 @@ index 6965c4298fe3..dd0e328737c6 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2974,7 +2899,6 @@ index 6965c4298fe3..dd0e328737c6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -2984,10 +2908,6 @@ index 6965c4298fe3..dd0e328737c6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3015,7 +2935,7 @@ index 6965c4298fe3..dd0e328737c6 100644
Library("builtin_audio_encoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index e0dcf8f03274..a29327a65377 100644
+index 2dbe0fd6bce3..a29327a65377 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3040,7 +2960,7 @@ index e0dcf8f03274..a29327a65377 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3197,7 +3117,6 @@ index e0dcf8f03274..a29327a65377 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -3207,10 +3126,6 @@ index e0dcf8f03274..a29327a65377 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3238,7 +3153,7 @@ index e0dcf8f03274..a29327a65377 100644
Library("audio_decoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index 708744cf3b72..68424c136524 100644
+index a1b1f8e9fccb..68424c136524 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3263,7 +3178,7 @@ index 708744cf3b72..68424c136524 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3420,7 +3335,6 @@ index 708744cf3b72..68424c136524 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -3430,10 +3344,6 @@ index 708744cf3b72..68424c136524 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3461,7 +3371,7 @@ index 708744cf3b72..68424c136524 100644
Library("audio_encoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index 4b96ef206879..4577862a247d 100644
+index 838977ba1042..4577862a247d 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3486,7 +3396,7 @@ index 4b96ef206879..4577862a247d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3643,7 +3553,6 @@ index 4b96ef206879..4577862a247d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -3653,10 +3562,6 @@ index 4b96ef206879..4577862a247d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3684,7 +3589,7 @@ index 4b96ef206879..4577862a247d 100644
Library("audio_decoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index bddf7d557198..cdb668cf70bc 100644
+index 2b1c0d220c3e..cdb668cf70bc 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3829,7 +3734,7 @@ index bddf7d557198..cdb668cf70bc 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3861,16 +3766,9 @@ index bddf7d557198..cdb668cf70bc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -3889,7 +3787,7 @@ index bddf7d557198..cdb668cf70bc 100644
-
Library("audio_encoder_g722_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index e35ace4e0ab9..3a983cc69d40 100644
+index 367caa077f2d..3a983cc69d40 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3914,7 +3812,7 @@ index e35ace4e0ab9..3a983cc69d40 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4071,7 +3969,6 @@ index e35ace4e0ab9..3a983cc69d40 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -4081,10 +3978,6 @@ index e35ace4e0ab9..3a983cc69d40 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4112,7 +4005,7 @@ index e35ace4e0ab9..3a983cc69d40 100644
Library("audio_encoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index 123ba8eb1c6f..af4f54885d1e 100644
+index b8bf808d3d73..af4f54885d1e 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4137,7 +4030,7 @@ index 123ba8eb1c6f..af4f54885d1e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4298,7 +4191,6 @@ index 123ba8eb1c6f..af4f54885d1e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -4308,10 +4200,6 @@ index 123ba8eb1c6f..af4f54885d1e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4339,7 +4227,7 @@ index 123ba8eb1c6f..af4f54885d1e 100644
Library("audio_decoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-index 843a9aee3bc9..9e4afff2cb93 100644
+index 909cc8c26f96..9e4afff2cb93 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4473,7 +4361,7 @@ index 843a9aee3bc9..9e4afff2cb93 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4505,16 +4393,9 @@ index 843a9aee3bc9..9e4afff2cb93 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4533,7 +4414,7 @@ index 843a9aee3bc9..9e4afff2cb93 100644
-
Library("audio_encoder_ilbc_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-index a01bbe78d5af..b52f29085529 100644
+index 08b426b9abd7..b52f29085529 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4558,7 +4439,7 @@ index a01bbe78d5af..b52f29085529 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4719,7 +4600,6 @@ index a01bbe78d5af..b52f29085529 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -4729,10 +4609,6 @@ index a01bbe78d5af..b52f29085529 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4760,7 +4636,7 @@ index a01bbe78d5af..b52f29085529 100644
Library("audio_encoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index fec5701696de..19274344f17c 100644
+index c36b4324e4b3..19274344f17c 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4785,7 +4661,7 @@ index fec5701696de..19274344f17c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4942,7 +4818,6 @@ index fec5701696de..19274344f17c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -4952,10 +4827,6 @@ index fec5701696de..19274344f17c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -4983,7 +4854,7 @@ index fec5701696de..19274344f17c 100644
Library("audio_decoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 41887d187159..e666d73db50a 100644
+index a9896dd203d6..e666d73db50a 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5128,7 +4999,7 @@ index 41887d187159..e666d73db50a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5160,16 +5031,9 @@ index 41887d187159..e666d73db50a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5188,7 +5052,7 @@ index 41887d187159..e666d73db50a 100644
-
Library("audio_decoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index 9c9bbb415b26..2a0eaf5162ae 100644
+index 7c7ed25cbc12..2a0eaf5162ae 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5213,7 +5077,7 @@ index 9c9bbb415b26..2a0eaf5162ae 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5374,7 +5238,6 @@ index 9c9bbb415b26..2a0eaf5162ae 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -5384,10 +5247,6 @@ index 9c9bbb415b26..2a0eaf5162ae 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5415,7 +5274,7 @@ index 9c9bbb415b26..2a0eaf5162ae 100644
Library("audio_decoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index ec36454e9f09..a1e0aebdd00b 100644
+index 7a8b6dc2e652..a1e0aebdd00b 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5440,7 +5299,7 @@ index ec36454e9f09..a1e0aebdd00b 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5597,7 +5456,6 @@ index ec36454e9f09..a1e0aebdd00b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -5607,10 +5465,6 @@ index ec36454e9f09..a1e0aebdd00b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5638,7 +5492,7 @@ index ec36454e9f09..a1e0aebdd00b 100644
Library("audio_encoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 6c061ce58f6b..1814a45bd0b9 100644
+index f68dce0d9dee..1814a45bd0b9 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -5664,7 +5518,7 @@ index 6c061ce58f6b..1814a45bd0b9 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,179 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,174 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5810,7 +5664,6 @@ index 6c061ce58f6b..1814a45bd0b9 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -5820,10 +5673,6 @@ index 6c061ce58f6b..1814a45bd0b9 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -5851,7 +5700,7 @@ index 6c061ce58f6b..1814a45bd0b9 100644
Library("audio_encoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index b5c0f484ad6e..3c36a8e40946 100644
+index f44d8836ef29..3c36a8e40946 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5876,7 +5725,7 @@ index b5c0f484ad6e..3c36a8e40946 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6037,7 +5886,6 @@ index b5c0f484ad6e..3c36a8e40946 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -6047,10 +5895,6 @@ index b5c0f484ad6e..3c36a8e40946 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6078,7 +5922,7 @@ index b5c0f484ad6e..3c36a8e40946 100644
Library("audio_encoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index f31b23065002..dee079f27798 100644
+index 5e169a3ffe4c..dee079f27798 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6103,7 +5947,7 @@ index f31b23065002..dee079f27798 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6253,7 +6097,6 @@ index f31b23065002..dee079f27798 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -6263,10 +6106,6 @@ index f31b23065002..dee079f27798 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6294,7 +6133,7 @@ index f31b23065002..dee079f27798 100644
Library("audio_options_api_gn")
diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index dcf9b27ca369..1fb50aa9e1e4 100644
+index 530662eb2f31..1fb50aa9e1e4 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6432,7 +6271,7 @@ index dcf9b27ca369..1fb50aa9e1e4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6464,16 +6303,9 @@ index dcf9b27ca369..1fb50aa9e1e4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6492,7 +6324,7 @@ index dcf9b27ca369..1fb50aa9e1e4 100644
-
Library("bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 5c4a7f29a005..93c7cd55cf2e 100644
+index 5656999ecb9a..93c7cd55cf2e 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6626,7 +6458,7 @@ index 5c4a7f29a005..93c7cd55cf2e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6658,16 +6490,9 @@ index 5c4a7f29a005..93c7cd55cf2e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6686,7 +6511,7 @@ index 5c4a7f29a005..93c7cd55cf2e 100644
-
Library("call_api_gn")
diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index a67107994317..d9e58de1c43a 100644
+index 157a34ec8e62..d9e58de1c43a 100644
--- third_party/libwebrtc/api/callfactory_api_gn/moz.build
+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6835,7 +6660,7 @@ index a67107994317..d9e58de1c43a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6867,16 +6692,9 @@ index a67107994317..d9e58de1c43a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -6895,7 +6713,7 @@ index a67107994317..d9e58de1c43a 100644
-
Library("callfactory_api_gn")
diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 65794fbdd2ac..1f0c3440b172 100644
+index 4147b3868be0..1f0c3440b172 100644
--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7033,7 +6851,7 @@ index 65794fbdd2ac..1f0c3440b172 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7065,16 +6883,9 @@ index 65794fbdd2ac..1f0c3440b172 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -7093,7 +6904,7 @@ index 65794fbdd2ac..1f0c3440b172 100644
-
Library("frame_decryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index 19352a6da41c..2f5ff0067bee 100644
+index 93034ef6e23e..2f5ff0067bee 100644
--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7231,7 +7042,7 @@ index 19352a6da41c..2f5ff0067bee 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7263,16 +7074,9 @@ index 19352a6da41c..2f5ff0067bee 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -7291,7 +7095,7 @@ index 19352a6da41c..2f5ff0067bee 100644
-
Library("frame_encryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index 3219fce47f9c..33542ced4242 100644
+index 9b5cca4f8b98..33542ced4242 100644
--- third_party/libwebrtc/api/crypto/options_gn/moz.build
+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7316,7 +7120,7 @@ index 3219fce47f9c..33542ced4242 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7462,7 +7266,6 @@ index 3219fce47f9c..33542ced4242 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -7472,10 +7275,6 @@ index 3219fce47f9c..33542ced4242 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -7502,8 +7301,195 @@ index 3219fce47f9c..33542ced4242 100644
+ DEFINES["USE_X11"] = "1"
Library("options_gn")
+diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
+index e7105ff57383..b7d434e7f0e5 100644
+--- third_party/libwebrtc/api/environment/environment_gn/moz.build
++++ third_party/libwebrtc/api/environment/environment_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "webrtc"
+
+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["__STD_C"] = True
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+ DEFINES["WEBRTC_ARCH_ARM64"] = True
+ DEFINES["WEBRTC_HAS_NEON"] = True
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["TARGET_CPU"] == "x86":
+
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+- OS_LIBS += [
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+- 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 a0129cce5aa1..29117e092916 100644
+index 619ea937f07b..29117e092916 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7641,7 +7627,7 @@ index a0129cce5aa1..29117e092916 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7673,16 +7659,9 @@ index a0129cce5aa1..29117e092916 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -7701,7 +7680,7 @@ index a0129cce5aa1..29117e092916 100644
-
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 5133134fc268..bbfe2fc66a9b 100644
+index 01ce20c5a613..bbfe2fc66a9b 100644
--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7726,7 +7705,7 @@ index 5133134fc268..bbfe2fc66a9b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7883,7 +7862,6 @@ index 5133134fc268..bbfe2fc66a9b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -7893,10 +7871,6 @@ index 5133134fc268..bbfe2fc66a9b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -7924,7 +7898,7 @@ index 5133134fc268..bbfe2fc66a9b 100644
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 0e5ed09f70fc..41db496b2998 100644
+index 967e416aad11..41db496b2998 100644
--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8058,7 +8032,7 @@ index 0e5ed09f70fc..41db496b2998 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8090,16 +8064,9 @@ index 0e5ed09f70fc..41db496b2998 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -8118,7 +8085,7 @@ index 0e5ed09f70fc..41db496b2998 100644
-
Library("field_trials_view_gn")
diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index 20da3e9cdbae..42bd8a0ebee8 100644
+index ea4cac127680..42bd8a0ebee8 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8263,7 +8230,7 @@ index 20da3e9cdbae..42bd8a0ebee8 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8295,16 +8262,9 @@ index 20da3e9cdbae..42bd8a0ebee8 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -8323,7 +8283,7 @@ index 20da3e9cdbae..42bd8a0ebee8 100644
-
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 0854c1f77115..96dce96e8ab5 100644
+index 980c9d9ca606..96dce96e8ab5 100644
--- third_party/libwebrtc/api/function_view_gn/moz.build
+++ third_party/libwebrtc/api/function_view_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8461,7 +8421,7 @@ index 0854c1f77115..96dce96e8ab5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8493,16 +8453,9 @@ index 0854c1f77115..96dce96e8ab5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -8521,7 +8474,7 @@ index 0854c1f77115..96dce96e8ab5 100644
-
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 3a6a8537c24d..b71b016ae856 100644
+index b3a3b0ee1b12..b71b016ae856 100644
--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8655,7 +8608,7 @@ index 3a6a8537c24d..b71b016ae856 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8687,16 +8640,9 @@ index 3a6a8537c24d..b71b016ae856 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -8715,7 +8661,7 @@ index 3a6a8537c24d..b71b016ae856 100644
-
Library("jingle_logging_api_gn")
diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index b4ff24a0b54c..a8d741a090d2 100644
+index fbbb882ebf1f..a8d741a090d2 100644
--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8849,7 +8795,7 @@ index b4ff24a0b54c..a8d741a090d2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8881,16 +8827,9 @@ index b4ff24a0b54c..a8d741a090d2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -8909,7 +8848,7 @@ index b4ff24a0b54c..a8d741a090d2 100644
-
Library("jingle_peerconnection_api_gn")
diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index 5e7de58f06b5..364fda084155 100644
+index dcdca04077c0..364fda084155 100644
--- third_party/libwebrtc/api/location_gn/moz.build
+++ third_party/libwebrtc/api/location_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9043,7 +8982,7 @@ index 5e7de58f06b5..364fda084155 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9075,16 +9014,9 @@ index 5e7de58f06b5..364fda084155 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9103,7 +9035,7 @@ index 5e7de58f06b5..364fda084155 100644
-
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 2eb6226bfb2d..7ecc837f314f 100644
+index f90e27491698..7ecc837f314f 100644
--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9237,7 +9169,7 @@ index 2eb6226bfb2d..7ecc837f314f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9269,16 +9201,9 @@ index 2eb6226bfb2d..7ecc837f314f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9297,7 +9222,7 @@ index 2eb6226bfb2d..7ecc837f314f 100644
-
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 b066645cd26c..67560deca0bc 100644
+index 759c156fb76f..67560deca0bc 100644
--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9322,7 +9247,7 @@ index b066645cd26c..67560deca0bc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9479,7 +9404,6 @@ index b066645cd26c..67560deca0bc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -9489,10 +9413,6 @@ index b066645cd26c..67560deca0bc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9520,7 +9440,7 @@ index b066645cd26c..67560deca0bc 100644
Library("media_stream_interface_gn")
diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index d89c86ef4bb1..a18489ff59f5 100644
+index ede22e499888..a18489ff59f5 100644
--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9658,7 +9578,7 @@ index d89c86ef4bb1..a18489ff59f5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9690,16 +9610,9 @@ index d89c86ef4bb1..a18489ff59f5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9718,7 +9631,7 @@ index d89c86ef4bb1..a18489ff59f5 100644
-
Library("metronome_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index 75602ac5122a..9f85d1d43198 100644
+index 5d18a89d1945..9f85d1d43198 100644
--- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
+++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9743,7 +9656,7 @@ index 75602ac5122a..9f85d1d43198 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9904,7 +9817,6 @@ index 75602ac5122a..9f85d1d43198 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -9914,10 +9826,6 @@ index 75602ac5122a..9f85d1d43198 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -9945,7 +9853,7 @@ index 75602ac5122a..9f85d1d43198 100644
Library("default_neteq_controller_factory_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index 7c4e1c550a82..45a550ec1872 100644
+index 7ed92b818331..45a550ec1872 100644
--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9970,7 +9878,7 @@ index 7c4e1c550a82..45a550ec1872 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10131,7 +10039,6 @@ index 7c4e1c550a82..45a550ec1872 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -10141,10 +10048,6 @@ index 7c4e1c550a82..45a550ec1872 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -10172,7 +10075,7 @@ index 7c4e1c550a82..45a550ec1872 100644
Library("neteq_api_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index 617ffd753eb2..568e7bbc811a 100644
+index c08d59e8acb0..568e7bbc811a 100644
--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10321,7 +10224,7 @@ index 617ffd753eb2..568e7bbc811a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10353,16 +10256,9 @@ index 617ffd753eb2..568e7bbc811a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -10381,7 +10277,7 @@ index 617ffd753eb2..568e7bbc811a 100644
-
Library("neteq_controller_api_gn")
diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index 8106b395ca55..6b28cb62c9fc 100644
+index ef3938ecf2df..6b28cb62c9fc 100644
--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10406,7 +10302,7 @@ index 8106b395ca55..6b28cb62c9fc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10556,7 +10452,6 @@ index 8106b395ca55..6b28cb62c9fc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -10566,10 +10461,6 @@ index 8106b395ca55..6b28cb62c9fc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -10597,7 +10488,7 @@ index 8106b395ca55..6b28cb62c9fc 100644
Library("tick_timer_gn")
diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 0ffd6a24063b..900b054a1cb4 100644
+index 1cfd2c0837b6..900b054a1cb4 100644
--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10731,7 +10622,7 @@ index 0ffd6a24063b..900b054a1cb4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10763,16 +10654,9 @@ index 0ffd6a24063b..900b054a1cb4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -10791,7 +10675,7 @@ index 0ffd6a24063b..900b054a1cb4 100644
-
Library("network_state_predictor_api_gn")
diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 090d23dd7626..4d79158262ef 100644
+index 5cac655d9009..4d79158262ef 100644
--- third_party/libwebrtc/api/priority_gn/moz.build
+++ third_party/libwebrtc/api/priority_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10925,7 +10809,7 @@ index 090d23dd7626..4d79158262ef 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10957,14 +10841,194 @@ index 090d23dd7626..4d79158262ef 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ Library("priority_gn")
+diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
+index 0fcde97e6b0f..b37e89e4fcab 100644
+--- third_party/libwebrtc/api/ref_count_gn/moz.build
++++ third_party/libwebrtc/api/ref_count_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "webrtc"
+
+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["RTC_ENABLE_WIN_WGC"] = True
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["__STD_C"] = True
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+ DEFINES["WEBRTC_ARCH_ARM64"] = True
+ DEFINES["WEBRTC_HAS_NEON"] = True
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["TARGET_CPU"] == "x86":
+
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support"
+- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
@@ -10983,9 +11047,9 @@ index 090d23dd7626..4d79158262ef 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("priority_gn")
+ Library("ref_count_gn")
diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index c18c17de9994..e7c234797960 100644
+index 96c04d125890..e7c234797960 100644
--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11119,7 +11183,7 @@ index c18c17de9994..e7c234797960 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11151,16 +11215,9 @@ index c18c17de9994..e7c234797960 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -11179,7 +11236,7 @@ index c18c17de9994..e7c234797960 100644
-
Library("refcountedbase_gn")
diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 19bee500727e..b394febab922 100644
+index 3c9d5f7f9b88..b394febab922 100644
--- third_party/libwebrtc/api/rtc_error_gn/moz.build
+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11204,7 +11261,7 @@ index 19bee500727e..b394febab922 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11361,7 +11418,6 @@ index 19bee500727e..b394febab922 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -11371,10 +11427,6 @@ index 19bee500727e..b394febab922 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -11402,7 +11454,7 @@ index 19bee500727e..b394febab922 100644
Library("rtc_error_gn")
diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index 1965bc7a12dd..dde96c64f726 100644
+index 991c0366b6b1..dde96c64f726 100644
--- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
+++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11427,7 +11479,7 @@ index 1965bc7a12dd..dde96c64f726 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11584,7 +11636,6 @@ index 1965bc7a12dd..dde96c64f726 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -11594,10 +11645,6 @@ index 1965bc7a12dd..dde96c64f726 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -11625,7 +11672,7 @@ index 1965bc7a12dd..dde96c64f726 100644
Library("rtc_event_log_gn")
diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index 7328eb81c013..84b819ba9e90 100644
+index 24f4f8fb24fe..84b819ba9e90 100644
--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11650,7 +11697,7 @@ index 7328eb81c013..84b819ba9e90 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11807,7 +11854,6 @@ index 7328eb81c013..84b819ba9e90 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -11817,10 +11863,6 @@ index 7328eb81c013..84b819ba9e90 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -11848,7 +11890,7 @@ index 7328eb81c013..84b819ba9e90 100644
Library("rtp_headers_gn")
diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index 92eb6cb3693b..50846adb8b4e 100644
+index fda93e184ec6..50846adb8b4e 100644
--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11873,7 +11915,7 @@ index 92eb6cb3693b..50846adb8b4e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12030,7 +12072,6 @@ index 92eb6cb3693b..50846adb8b4e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -12040,10 +12081,6 @@ index 92eb6cb3693b..50846adb8b4e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -12071,7 +12108,7 @@ index 92eb6cb3693b..50846adb8b4e 100644
Library("rtp_packet_info_gn")
diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index 480114ad07dd..9330001cc876 100644
+index 09590e547db4..9330001cc876 100644
--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12096,7 +12133,7 @@ index 480114ad07dd..9330001cc876 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12246,7 +12283,6 @@ index 480114ad07dd..9330001cc876 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -12256,10 +12292,6 @@ index 480114ad07dd..9330001cc876 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -12287,7 +12319,7 @@ index 480114ad07dd..9330001cc876 100644
Library("rtp_parameters_gn")
diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index 9938ecca35ee..3f2c9b2e4cd7 100644
+index e7259b40e084..3f2c9b2e4cd7 100644
--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12421,7 +12453,7 @@ index 9938ecca35ee..3f2c9b2e4cd7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12453,16 +12485,9 @@ index 9938ecca35ee..3f2c9b2e4cd7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -12481,7 +12506,7 @@ index 9938ecca35ee..3f2c9b2e4cd7 100644
-
Library("rtp_sender_interface_gn")
diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index f8cd38576d8e..fc343fe57be9 100644
+index c493f010c8bd..fc343fe57be9 100644
--- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12506,7 +12531,7 @@ index f8cd38576d8e..fc343fe57be9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12663,7 +12688,6 @@ index f8cd38576d8e..fc343fe57be9 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -12673,10 +12697,6 @@ index f8cd38576d8e..fc343fe57be9 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -12704,7 +12724,7 @@ index f8cd38576d8e..fc343fe57be9 100644
Library("rtp_sender_setparameters_callback_gn")
diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 9f3a7424ae8a..f12c6a35f934 100644
+index 66b863defb7a..f12c6a35f934 100644
--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12838,7 +12858,7 @@ index 9f3a7424ae8a..f12c6a35f934 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12870,16 +12890,9 @@ index 9f3a7424ae8a..f12c6a35f934 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -12898,7 +12911,7 @@ index 9f3a7424ae8a..f12c6a35f934 100644
-
Library("rtp_transceiver_direction_gn")
diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index c2f167533dc2..e482239ee788 100644
+index 6593008ce69b..e482239ee788 100644
--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13032,7 +13045,7 @@ index c2f167533dc2..e482239ee788 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13064,16 +13077,9 @@ index c2f167533dc2..e482239ee788 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13092,7 +13098,7 @@ index c2f167533dc2..e482239ee788 100644
-
Library("scoped_refptr_gn")
diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index a45bc8e9c1e1..591815f47c77 100644
+index d50c0f4f320f..591815f47c77 100644
--- third_party/libwebrtc/api/sequence_checker_gn/moz.build
+++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13230,7 +13236,7 @@ index a45bc8e9c1e1..591815f47c77 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13262,16 +13268,9 @@ index a45bc8e9c1e1..591815f47c77 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13290,7 +13289,7 @@ index a45bc8e9c1e1..591815f47c77 100644
-
Library("sequence_checker_gn")
diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-index b46ec1656b48..26728a141487 100644
+index 1f52ba37d7d4..26728a141487 100644
--- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
+++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13428,7 +13427,7 @@ index b46ec1656b48..26728a141487 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13460,16 +13459,9 @@ index b46ec1656b48..26728a141487 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13488,7 +13480,7 @@ index b46ec1656b48..26728a141487 100644
-
Library("simulated_network_api_gn")
diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-index 52a2e5003b5a..e8094ed7f16d 100644
+index 43229b22ed5c..e8094ed7f16d 100644
--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13513,7 +13505,7 @@ index 52a2e5003b5a..e8094ed7f16d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13663,7 +13655,6 @@ index 52a2e5003b5a..e8094ed7f16d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -13673,10 +13664,6 @@ index 52a2e5003b5a..e8094ed7f16d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13704,7 +13691,7 @@ index 52a2e5003b5a..e8094ed7f16d 100644
Library("pending_task_safety_flag_gn")
diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index 73630a2ad988..e9f40adf5dcc 100644
+index 8c04d40cf594..e9f40adf5dcc 100644
--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13729,7 +13716,7 @@ index 73630a2ad988..e9f40adf5dcc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13879,7 +13866,6 @@ index 73630a2ad988..e9f40adf5dcc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -13889,10 +13875,6 @@ index 73630a2ad988..e9f40adf5dcc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -13920,7 +13902,7 @@ index 73630a2ad988..e9f40adf5dcc 100644
Library("task_queue_gn")
diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index d99d149fa37c..716e91c361d1 100644
+index 2b732ca51e9d..716e91c361d1 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13945,7 +13927,7 @@ index d99d149fa37c..716e91c361d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14091,7 +14073,6 @@ index d99d149fa37c..716e91c361d1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -14101,10 +14082,6 @@ index d99d149fa37c..716e91c361d1 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -14132,7 +14109,7 @@ index d99d149fa37c..716e91c361d1 100644
Library("bitrate_settings_gn")
diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index 9168cf915658..12180edceced 100644
+index dba9cee6bdd0..12180edceced 100644
--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14277,7 +14254,7 @@ index 9168cf915658..12180edceced 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14309,16 +14286,9 @@ index 9168cf915658..12180edceced 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -14337,7 +14307,7 @@ index 9168cf915658..12180edceced 100644
-
Library("datagram_transport_interface_gn")
diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index fd2b2dd12b03..10d7b6bb4d54 100644
+index dd3370838d67..10d7b6bb4d54 100644
--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14362,7 +14332,7 @@ index fd2b2dd12b03..10d7b6bb4d54 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14519,7 +14489,6 @@ index fd2b2dd12b03..10d7b6bb4d54 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -14529,10 +14498,6 @@ index fd2b2dd12b03..10d7b6bb4d54 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -14560,7 +14525,7 @@ index fd2b2dd12b03..10d7b6bb4d54 100644
Library("field_trial_based_config_gn")
diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 4a7c84915c5e..929cc485f211 100644
+index 80dee942e0ee..929cc485f211 100644
--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14585,7 +14550,7 @@ index 4a7c84915c5e..929cc485f211 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14747,7 +14712,6 @@ index 4a7c84915c5e..929cc485f211 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -14757,10 +14721,6 @@ index 4a7c84915c5e..929cc485f211 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -14788,7 +14748,7 @@ index 4a7c84915c5e..929cc485f211 100644
Library("goog_cc_gn")
diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index 76dd117a863f..a67647ff4e6a 100644
+index e11b34ba718e..a67647ff4e6a 100644
--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14813,7 +14773,7 @@ index 76dd117a863f..a67647ff4e6a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14970,7 +14930,6 @@ index 76dd117a863f..a67647ff4e6a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -14980,10 +14939,6 @@ index 76dd117a863f..a67647ff4e6a 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -15011,7 +14966,7 @@ index 76dd117a863f..a67647ff4e6a 100644
Library("network_control_gn")
diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index a2fe75e60e9b..cf683816e0d6 100644
+index 568c7d976884..cf683816e0d6 100644
--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15036,7 +14991,7 @@ index a2fe75e60e9b..cf683816e0d6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15186,7 +15141,6 @@ index a2fe75e60e9b..cf683816e0d6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -15196,10 +15150,6 @@ index a2fe75e60e9b..cf683816e0d6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -15227,7 +15177,7 @@ index a2fe75e60e9b..cf683816e0d6 100644
Library("dependency_descriptor_gn")
diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index 9a7b0b69bf3b..791e45051d89 100644
+index 9d993f6f68a1..791e45051d89 100644
--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15372,7 +15322,7 @@ index 9a7b0b69bf3b..791e45051d89 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15404,16 +15354,9 @@ index 9a7b0b69bf3b..791e45051d89 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -15432,7 +15375,7 @@ index 9a7b0b69bf3b..791e45051d89 100644
-
Library("rtp_source_gn")
diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-index 36750a2f188e..d7df0d5d7208 100644
+index ad873a179659..d7df0d5d7208 100644
--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15566,7 +15509,7 @@ index 36750a2f188e..d7df0d5d7208 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15598,16 +15541,9 @@ index 36750a2f188e..d7df0d5d7208 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -15626,7 +15562,7 @@ index 36750a2f188e..d7df0d5d7208 100644
-
Library("stun_types_gn")
diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index af080bee0bd0..f01561893920 100644
+index 506cb2f24dd1..f01561893920 100644
--- third_party/libwebrtc/api/transport_api_gn/moz.build
+++ third_party/libwebrtc/api/transport_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15651,7 +15587,7 @@ index af080bee0bd0..f01561893920 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15801,7 +15737,6 @@ index af080bee0bd0..f01561893920 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -15811,10 +15746,6 @@ index af080bee0bd0..f01561893920 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -15842,7 +15773,7 @@ index af080bee0bd0..f01561893920 100644
Library("transport_api_gn")
diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index 4964c3e05f88..91d77bc12c86 100644
+index b2bb9b7c5fd0..91d77bc12c86 100644
--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15867,7 +15798,7 @@ index 4964c3e05f88..91d77bc12c86 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16017,7 +15948,6 @@ index 4964c3e05f88..91d77bc12c86 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -16027,10 +15957,6 @@ index 4964c3e05f88..91d77bc12c86 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16058,7 +15984,7 @@ index 4964c3e05f88..91d77bc12c86 100644
Library("data_rate_gn")
diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index 0fe0bc100b9e..31b25242e9a9 100644
+index ceaa9da9a29a..31b25242e9a9 100644
--- third_party/libwebrtc/api/units/data_size_gn/moz.build
+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16083,7 +16009,7 @@ index 0fe0bc100b9e..31b25242e9a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16233,7 +16159,6 @@ index 0fe0bc100b9e..31b25242e9a9 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -16243,10 +16168,6 @@ index 0fe0bc100b9e..31b25242e9a9 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16274,7 +16195,7 @@ index 0fe0bc100b9e..31b25242e9a9 100644
Library("data_size_gn")
diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index 413a57a8f3c4..f780d340c448 100644
+index 8b0607cf752f..f780d340c448 100644
--- third_party/libwebrtc/api/units/frequency_gn/moz.build
+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16299,7 +16220,7 @@ index 413a57a8f3c4..f780d340c448 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16449,7 +16370,6 @@ index 413a57a8f3c4..f780d340c448 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -16459,10 +16379,6 @@ index 413a57a8f3c4..f780d340c448 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16490,7 +16406,7 @@ index 413a57a8f3c4..f780d340c448 100644
Library("frequency_gn")
diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index 39355ed5881c..2df892f4a708 100644
+index 62205516148a..2df892f4a708 100644
--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16515,7 +16431,7 @@ index 39355ed5881c..2df892f4a708 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16665,7 +16581,6 @@ index 39355ed5881c..2df892f4a708 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -16675,10 +16590,6 @@ index 39355ed5881c..2df892f4a708 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16706,7 +16617,7 @@ index 39355ed5881c..2df892f4a708 100644
Library("time_delta_gn")
diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index da68eea1608b..f4f43207ca71 100644
+index 083b864ff086..f4f43207ca71 100644
--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16731,7 +16642,7 @@ index da68eea1608b..f4f43207ca71 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16881,7 +16792,6 @@ index da68eea1608b..f4f43207ca71 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -16891,10 +16801,6 @@ index da68eea1608b..f4f43207ca71 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -16922,7 +16828,7 @@ index da68eea1608b..f4f43207ca71 100644
Library("timestamp_gn")
diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index cb32b05fa6ce..114f6b43ad03 100644
+index 620fba65aa45..114f6b43ad03 100644
--- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16947,7 +16853,7 @@ index cb32b05fa6ce..114f6b43ad03 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17109,7 +17015,6 @@ index cb32b05fa6ce..114f6b43ad03 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -17119,10 +17024,6 @@ index cb32b05fa6ce..114f6b43ad03 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17150,7 +17051,7 @@ index cb32b05fa6ce..114f6b43ad03 100644
Library("builtin_video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index fdb34bf903a5..3aab4972d1b0 100644
+index 4c92d824ae4e..3aab4972d1b0 100644
--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17175,7 +17076,7 @@ index fdb34bf903a5..3aab4972d1b0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17332,7 +17233,6 @@ index fdb34bf903a5..3aab4972d1b0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -17342,10 +17242,6 @@ index fdb34bf903a5..3aab4972d1b0 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17373,7 +17269,7 @@ index fdb34bf903a5..3aab4972d1b0 100644
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index 3bc012ad2867..9bbfe7ab6b7c 100644
+index 25d2d0998ea5..9bbfe7ab6b7c 100644
--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17398,7 +17294,7 @@ index 3bc012ad2867..9bbfe7ab6b7c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17555,7 +17451,6 @@ index 3bc012ad2867..9bbfe7ab6b7c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -17565,10 +17460,6 @@ index 3bc012ad2867..9bbfe7ab6b7c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17596,7 +17487,7 @@ index 3bc012ad2867..9bbfe7ab6b7c 100644
Library("encoded_image_gn")
diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index 2614e67133bc..b0ddb83924e2 100644
+index 048097ce50fd..b0ddb83924e2 100644
--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
+++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17621,7 +17512,7 @@ index 2614e67133bc..b0ddb83924e2 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17783,7 +17674,6 @@ index 2614e67133bc..b0ddb83924e2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -17793,10 +17683,6 @@ index 2614e67133bc..b0ddb83924e2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -17824,7 +17710,7 @@ index 2614e67133bc..b0ddb83924e2 100644
Library("frame_buffer_gn")
diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index ace02623f71c..c5cf761665a3 100644
+index a5b4399e4ad4..c5cf761665a3 100644
--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17969,7 +17855,7 @@ index ace02623f71c..c5cf761665a3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -18001,16 +17887,9 @@ index ace02623f71c..c5cf761665a3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -18029,7 +17908,7 @@ index ace02623f71c..c5cf761665a3 100644
-
Library("recordable_encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index f27e4cc9441b..581ca3830235 100644
+index 6ee89b6451ad..581ca3830235 100644
--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18163,7 +18042,7 @@ index f27e4cc9441b..581ca3830235 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -18195,16 +18074,9 @@ index f27e4cc9441b..581ca3830235 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -18223,7 +18095,7 @@ index f27e4cc9441b..581ca3830235 100644
-
Library("render_resolution_gn")
diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
-index 673bb4f1c9f3..8b1b3fe09fa1 100644
+index de79a64a660c..8b1b3fe09fa1 100644
--- third_party/libwebrtc/api/video/resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/resolution_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18357,7 +18229,7 @@ index 673bb4f1c9f3..8b1b3fe09fa1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -18389,16 +18261,9 @@ index 673bb4f1c9f3..8b1b3fe09fa1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -18417,7 +18282,7 @@ index 673bb4f1c9f3..8b1b3fe09fa1 100644
-
Library("resolution_gn")
diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index ffff5639eeef..26cb2efe4e07 100644
+index 4483b3eaef01..26cb2efe4e07 100644
--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18442,7 +18307,7 @@ index ffff5639eeef..26cb2efe4e07 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18592,7 +18457,6 @@ index ffff5639eeef..26cb2efe4e07 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -18602,10 +18466,6 @@ index ffff5639eeef..26cb2efe4e07 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -18633,7 +18493,7 @@ index ffff5639eeef..26cb2efe4e07 100644
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index be63dc82523f..a7dbc316cfc0 100644
+index 1196221e634e..a7dbc316cfc0 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18658,7 +18518,7 @@ index be63dc82523f..a7dbc316cfc0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18808,7 +18668,6 @@ index be63dc82523f..a7dbc316cfc0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -18818,10 +18677,6 @@ index be63dc82523f..a7dbc316cfc0 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -18849,7 +18704,7 @@ index be63dc82523f..a7dbc316cfc0 100644
Library("video_bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index 222bcaf25116..df387e75d820 100644
+index ff4934b7b562..df387e75d820 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18994,7 +18849,7 @@ index 222bcaf25116..df387e75d820 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19026,16 +18881,9 @@ index 222bcaf25116..df387e75d820 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19054,7 +18902,7 @@ index 222bcaf25116..df387e75d820 100644
-
Library("video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index e7f3f5a4de36..d83935fe0710 100644
+index 758cbb7521f5..d83935fe0710 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19079,7 +18927,7 @@ index e7f3f5a4de36..d83935fe0710 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19229,7 +19077,6 @@ index e7f3f5a4de36..d83935fe0710 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -19239,10 +19086,6 @@ index e7f3f5a4de36..d83935fe0710 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19270,7 +19113,7 @@ index e7f3f5a4de36..d83935fe0710 100644
Library("video_bitrate_allocator_gn")
diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 403c521a1f56..8bfda2bd2815 100644
+index 2275aa4aa15b..8bfda2bd2815 100644
--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19404,7 +19247,7 @@ index 403c521a1f56..8bfda2bd2815 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19436,16 +19279,9 @@ index 403c521a1f56..8bfda2bd2815 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19464,7 +19300,7 @@ index 403c521a1f56..8bfda2bd2815 100644
-
Library("video_codec_constants_gn")
diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index b0fc90582b6e..67fafe98aa0c 100644
+index 203b03a0a377..67fafe98aa0c 100644
--- third_party/libwebrtc/api/video/video_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19489,7 +19325,7 @@ index b0fc90582b6e..67fafe98aa0c 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,185 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19646,7 +19482,6 @@ index b0fc90582b6e..67fafe98aa0c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -19656,10 +19491,6 @@ index b0fc90582b6e..67fafe98aa0c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19687,7 +19518,7 @@ index b0fc90582b6e..67fafe98aa0c 100644
Library("video_frame_gn")
diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index 7fe6e4df955d..7b3d8fef889c 100644
+index 12435133353f..7b3d8fef889c 100644
--- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19712,7 +19543,7 @@ index 7fe6e4df955d..7b3d8fef889c 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,190 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,185 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19869,7 +19700,6 @@ index 7fe6e4df955d..7b3d8fef889c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -19879,10 +19709,6 @@ index 7fe6e4df955d..7b3d8fef889c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -19910,7 +19736,7 @@ index 7fe6e4df955d..7b3d8fef889c 100644
Library("video_frame_i010_gn")
diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index d80dda91786b..900162a802f7 100644
+index 6616ea0dd6ed..900162a802f7 100644
--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19935,7 +19761,7 @@ index d80dda91786b..900162a802f7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20092,7 +19918,6 @@ index d80dda91786b..900162a802f7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -20102,10 +19927,6 @@ index d80dda91786b..900162a802f7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20133,7 +19954,7 @@ index d80dda91786b..900162a802f7 100644
Library("video_frame_metadata_gn")
diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index 8fcbef76e8e6..3ebf86087e9b 100644
+index ab7548fe8dd8..3ebf86087e9b 100644
--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20271,7 +20092,7 @@ index 8fcbef76e8e6..3ebf86087e9b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20303,16 +20124,9 @@ index 8fcbef76e8e6..3ebf86087e9b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20331,7 +20145,7 @@ index 8fcbef76e8e6..3ebf86087e9b 100644
-
Library("video_frame_type_gn")
diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index b8ba6ec54b86..13701e033163 100644
+index 7f88b15c07b6..13701e033163 100644
--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20469,7 +20283,7 @@ index b8ba6ec54b86..13701e033163 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20501,16 +20315,9 @@ index b8ba6ec54b86..13701e033163 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20529,7 +20336,7 @@ index b8ba6ec54b86..13701e033163 100644
-
Library("video_layers_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index f65965f80bcd..039f412a6c99 100644
+index 2f02f285f2af..039f412a6c99 100644
--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20554,7 +20361,7 @@ index f65965f80bcd..039f412a6c99 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20711,7 +20518,6 @@ index f65965f80bcd..039f412a6c99 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -20721,10 +20527,6 @@ index f65965f80bcd..039f412a6c99 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20752,7 +20554,7 @@ index f65965f80bcd..039f412a6c99 100644
Library("video_rtp_headers_gn")
diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index 7b8a329463c7..fa61dad4d254 100644
+index f75eac803f84..fa61dad4d254 100644
--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20897,7 +20699,7 @@ index 7b8a329463c7..fa61dad4d254 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20929,16 +20731,9 @@ index 7b8a329463c7..fa61dad4d254 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -20957,7 +20752,7 @@ index 7b8a329463c7..fa61dad4d254 100644
-
Library("video_stream_encoder_gn")
diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index c3642c46d0fe..a20debacf2b1 100644
+index 866df39c97a7..a20debacf2b1 100644
--- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21095,7 +20890,7 @@ index c3642c46d0fe..a20debacf2b1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -21127,16 +20922,9 @@ index c3642c46d0fe..a20debacf2b1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -21155,7 +20943,7 @@ index c3642c46d0fe..a20debacf2b1 100644
-
Library("bitstream_parser_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index 4e928c91a430..554a2bc0b150 100644
+index e8139cb6f264..554a2bc0b150 100644
--- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21180,7 +20968,7 @@ index 4e928c91a430..554a2bc0b150 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,195 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21342,7 +21130,6 @@ index 4e928c91a430..554a2bc0b150 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -21352,10 +21139,6 @@ index 4e928c91a430..554a2bc0b150 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -21383,7 +21166,7 @@ index 4e928c91a430..554a2bc0b150 100644
Library("rtc_software_fallback_wrappers_gn")
diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index d63795ed948e..874d12b31e06 100644
+index 491c4880cc46..874d12b31e06 100644
--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21408,7 +21191,7 @@ index d63795ed948e..874d12b31e06 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21558,7 +21341,6 @@ index d63795ed948e..874d12b31e06 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -21568,10 +21350,6 @@ index d63795ed948e..874d12b31e06 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -21599,7 +21377,7 @@ index d63795ed948e..874d12b31e06 100644
Library("scalability_mode_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index 89cce4215bb6..c866cb6d800f 100644
+index c6c127e5b607..c866cb6d800f 100644
--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21624,7 +21402,7 @@ index 89cce4215bb6..c866cb6d800f 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,190 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,185 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21781,7 +21559,6 @@ index 89cce4215bb6..c866cb6d800f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -21791,10 +21568,6 @@ index 89cce4215bb6..c866cb6d800f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -21822,7 +21595,7 @@ index 89cce4215bb6..c866cb6d800f 100644
Library("video_codecs_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index e757e9ed510c..eff6026011a0 100644
+index 7131057c2f1c..eff6026011a0 100644
--- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21847,7 +21620,7 @@ index e757e9ed510c..eff6026011a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22009,7 +21782,6 @@ index e757e9ed510c..eff6026011a0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -22019,10 +21791,6 @@ index e757e9ed510c..eff6026011a0 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22050,7 +21818,7 @@ index e757e9ed510c..eff6026011a0 100644
Library("vp8_temporal_layers_factory_gn")
diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index 8213e3088f48..b1b79e03c8ee 100644
+index 9e9852b71fa3..b1b79e03c8ee 100644
--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22184,7 +21952,7 @@ index 8213e3088f48..b1b79e03c8ee 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22216,16 +21984,9 @@ index 8213e3088f48..b1b79e03c8ee 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22244,7 +22005,7 @@ index 8213e3088f48..b1b79e03c8ee 100644
-
Library("video_track_source_constraints_gn")
diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index e81a4f673bac..bb58c94c5403 100644
+index da615157b20d..bb58c94c5403 100644
--- third_party/libwebrtc/audio/audio_gn/moz.build
+++ third_party/libwebrtc/audio/audio_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22269,7 +22030,7 @@ index e81a4f673bac..bb58c94c5403 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,195 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22431,7 +22192,6 @@ index e81a4f673bac..bb58c94c5403 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -22441,10 +22201,6 @@ index e81a4f673bac..bb58c94c5403 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22472,7 +22228,7 @@ index e81a4f673bac..bb58c94c5403 100644
Library("audio_gn")
diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index e215792f649d..aab0bc81b0aa 100644
+index 6489497db43a..aab0bc81b0aa 100644
--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22497,7 +22253,7 @@ index e215792f649d..aab0bc81b0aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22658,7 +22414,6 @@ index e215792f649d..aab0bc81b0aa 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -22668,10 +22423,6 @@ index e215792f649d..aab0bc81b0aa 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22699,7 +22450,7 @@ index e215792f649d..aab0bc81b0aa 100644
Library("audio_frame_operations_gn")
diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index d8893a734152..6e627cb67c35 100644
+index 79a2aa9defd9..6e627cb67c35 100644
--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22724,7 +22475,7 @@ index d8893a734152..6e627cb67c35 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,195 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22886,7 +22637,6 @@ index d8893a734152..6e627cb67c35 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -22896,10 +22646,6 @@ index d8893a734152..6e627cb67c35 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -22927,7 +22673,7 @@ index d8893a734152..6e627cb67c35 100644
Library("resource_adaptation_gn")
diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index 2b42e8ebf96e..6f80ac1cc6e5 100644
+index a53966813f73..6f80ac1cc6e5 100644
--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23072,7 +22818,7 @@ index 2b42e8ebf96e..6f80ac1cc6e5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -23104,16 +22850,9 @@ index 2b42e8ebf96e..6f80ac1cc6e5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -23132,7 +22871,7 @@ index 2b42e8ebf96e..6f80ac1cc6e5 100644
-
Library("audio_sender_interface_gn")
diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index a56b55faf3bc..79b7f726fe25 100644
+index db772f8d3965..79b7f726fe25 100644
--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23157,7 +22896,7 @@ index a56b55faf3bc..79b7f726fe25 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23318,7 +23057,6 @@ index a56b55faf3bc..79b7f726fe25 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -23328,10 +23066,6 @@ index a56b55faf3bc..79b7f726fe25 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -23359,7 +23093,7 @@ index a56b55faf3bc..79b7f726fe25 100644
Library("bitrate_allocator_gn")
diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index e6f73025aa61..d5840ec1a784 100644
+index f7c51b4a7ccd..d5840ec1a784 100644
--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23384,7 +23118,7 @@ index e6f73025aa61..d5840ec1a784 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23545,7 +23279,6 @@ index e6f73025aa61..d5840ec1a784 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -23555,10 +23288,6 @@ index e6f73025aa61..d5840ec1a784 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -23586,7 +23315,7 @@ index e6f73025aa61..d5840ec1a784 100644
Library("bitrate_configurator_gn")
diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 25c1961b89ae..172d26827022 100644
+index 20f1f973a5da..172d26827022 100644
--- third_party/libwebrtc/call/call_gn/moz.build
+++ third_party/libwebrtc/call/call_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23611,7 +23340,7 @@ index 25c1961b89ae..172d26827022 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,195 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23773,7 +23502,6 @@ index 25c1961b89ae..172d26827022 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -23783,10 +23511,6 @@ index 25c1961b89ae..172d26827022 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -23814,7 +23538,7 @@ index 25c1961b89ae..172d26827022 100644
Library("call_gn")
diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index a5796666d84d..0c8e7e07006f 100644
+index a7db90d471a3..0c8e7e07006f 100644
--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23839,7 +23563,7 @@ index a5796666d84d..0c8e7e07006f 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,195 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24001,7 +23725,6 @@ index a5796666d84d..0c8e7e07006f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -24011,10 +23734,6 @@ index a5796666d84d..0c8e7e07006f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24042,7 +23761,7 @@ index a5796666d84d..0c8e7e07006f 100644
Library("call_interfaces_gn")
diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index 92973e6d7b60..99fc4b2ce9c4 100644
+index f25941483566..99fc4b2ce9c4 100644
--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24191,7 +23910,7 @@ index 92973e6d7b60..99fc4b2ce9c4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24223,16 +23942,9 @@ index 92973e6d7b60..99fc4b2ce9c4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24251,7 +23963,7 @@ index 92973e6d7b60..99fc4b2ce9c4 100644
-
Library("receive_stream_interface_gn")
diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index c83031d5b506..384f284c4233 100644
+index d5223f0b8b4e..384f284c4233 100644
--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24276,7 +23988,7 @@ index c83031d5b506..384f284c4233 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24437,7 +24149,6 @@ index c83031d5b506..384f284c4233 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -24447,10 +24158,6 @@ index c83031d5b506..384f284c4233 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24478,7 +24185,7 @@ index c83031d5b506..384f284c4233 100644
Library("rtp_interfaces_gn")
diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index 8809c7664f76..a35b27249321 100644
+index b6b43b0afac7..a35b27249321 100644
--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24503,7 +24210,7 @@ index 8809c7664f76..a35b27249321 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,195 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24665,7 +24372,6 @@ index 8809c7664f76..a35b27249321 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -24675,10 +24381,6 @@ index 8809c7664f76..a35b27249321 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24706,7 +24408,7 @@ index 8809c7664f76..a35b27249321 100644
Library("rtp_receiver_gn")
diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index 09560bbaab54..864bbdfd7819 100644
+index 54d111541751..864bbdfd7819 100644
--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24731,7 +24433,7 @@ index 09560bbaab54..864bbdfd7819 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,195 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24893,7 +24595,6 @@ index 09560bbaab54..864bbdfd7819 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -24903,10 +24604,6 @@ index 09560bbaab54..864bbdfd7819 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -24934,7 +24631,7 @@ index 09560bbaab54..864bbdfd7819 100644
Library("rtp_sender_gn")
diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index e2e087a17fe3..43695342b267 100644
+index 28745e4fc6de..43695342b267 100644
--- third_party/libwebrtc/call/version_gn/moz.build
+++ third_party/libwebrtc/call/version_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24959,7 +24656,7 @@ index e2e087a17fe3..43695342b267 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25105,7 +24802,6 @@ index e2e087a17fe3..43695342b267 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -25115,10 +24811,6 @@ index e2e087a17fe3..43695342b267 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -25146,7 +24838,7 @@ index e2e087a17fe3..43695342b267 100644
Library("version_gn")
diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build
-index f2ec65de01cc..c2ee6bd9eb51 100644
+index cf58d3748ec0..c2ee6bd9eb51 100644
--- third_party/libwebrtc/call/video_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25171,7 +24863,7 @@ index f2ec65de01cc..c2ee6bd9eb51 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25332,7 +25024,6 @@ index f2ec65de01cc..c2ee6bd9eb51 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -25342,10 +25033,6 @@ index f2ec65de01cc..c2ee6bd9eb51 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -25373,7 +25060,7 @@ index f2ec65de01cc..c2ee6bd9eb51 100644
Library("video_stream_api_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index 390c83ec43a4..0b18db99441c 100644
+index 708eb92e1e45..0b18db99441c 100644
--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
@@ -17,12 +17,22 @@ CXXFLAGS += [
@@ -25399,7 +25086,7 @@ index 390c83ec43a4..0b18db99441c 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,141 +60,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,137 +60,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25510,12 +25197,12 @@ index 390c83ec43a4..0b18db99441c 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
DEFINES["_DEBUG"] = True
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -25531,10 +25218,6 @@ index 390c83ec43a4..0b18db99441c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
@@ -25545,7 +25228,7 @@ index 390c83ec43a4..0b18db99441c 100644
Library("common_audio_avx2_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index ec4329a9cc6e..4adf2cb0a3ff 100644
+index deb2dbe3011d..4adf2cb0a3ff 100644
--- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25684,7 +25367,7 @@ index ec4329a9cc6e..4adf2cb0a3ff 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -25716,16 +25399,9 @@ index ec4329a9cc6e..4adf2cb0a3ff 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -25744,7 +25420,7 @@ index ec4329a9cc6e..4adf2cb0a3ff 100644
-
Library("common_audio_c_arm_asm_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index 1c3cdc16241f..57ae8a9c5502 100644
+index 77ad77a1d59c..57ae8a9c5502 100644
--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25927,7 +25603,7 @@ index 1c3cdc16241f..57ae8a9c5502 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
"/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -250,93 +137,21 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -250,88 +137,21 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -25975,7 +25651,6 @@ index 1c3cdc16241f..57ae8a9c5502 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -25986,10 +25661,6 @@ index 1c3cdc16241f..57ae8a9c5502 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
@@ -26025,7 +25696,7 @@ index 1c3cdc16241f..57ae8a9c5502 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -344,13 +159,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+@@ -339,13 +159,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -26041,7 +25712,7 @@ index 1c3cdc16241f..57ae8a9c5502 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -358,14 +169,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -353,14 +169,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -26059,7 +25730,7 @@ index 1c3cdc16241f..57ae8a9c5502 100644
Library("common_audio_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index 31757c2b89d3..ccbce8a93a86 100644
+index 9fc98aac37b4..ccbce8a93a86 100644
--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -26084,7 +25755,7 @@ index 31757c2b89d3..ccbce8a93a86 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26245,7 +25916,6 @@ index 31757c2b89d3..ccbce8a93a86 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -26255,10 +25925,6 @@ index 31757c2b89d3..ccbce8a93a86 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -26286,7 +25952,7 @@ index 31757c2b89d3..ccbce8a93a86 100644
Library("common_audio_cc_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index b6c5dc57c8fb..208fd6af96b7 100644
+index ee91cec7752d..208fd6af96b7 100644
--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -26311,7 +25977,7 @@ index b6c5dc57c8fb..208fd6af96b7 100644
FINAL_LIBRARY = "webrtc"
-@@ -56,194 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,189 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26472,7 +26138,6 @@ index b6c5dc57c8fb..208fd6af96b7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -26482,10 +26147,6 @@ index b6c5dc57c8fb..208fd6af96b7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -26513,7 +26174,7 @@ index b6c5dc57c8fb..208fd6af96b7 100644
Library("common_audio_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index f2ef55667bcb..665f9d57f8fa 100644
+index 3890cd0f9429..665f9d57f8fa 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
@@ -12,12 +12,23 @@ AllowCompilerWarnings()
@@ -26540,7 +26201,7 @@ index f2ef55667bcb..665f9d57f8fa 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,152 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,151 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26685,7 +26346,6 @@ index f2ef55667bcb..665f9d57f8fa 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -26695,7 +26355,7 @@ index f2ef55667bcb..665f9d57f8fa 100644
-
Library("common_audio_neon_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index 2b5a1cf4ccbe..7b093b38218c 100644
+index b8b06ffc74bc..7b093b38218c 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
@@ -12,12 +12,23 @@ AllowCompilerWarnings()
@@ -26722,7 +26382,7 @@ index 2b5a1cf4ccbe..7b093b38218c 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,152 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,151 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26867,7 +26527,6 @@ index 2b5a1cf4ccbe..7b093b38218c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -26877,7 +26536,7 @@ index 2b5a1cf4ccbe..7b093b38218c 100644
-
Library("common_audio_neon_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 298c08b4189f..60b8bdd048ee 100644
+index 7f0b17b28760..60b8bdd048ee 100644
--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -26903,7 +26562,7 @@ index 298c08b4189f..60b8bdd048ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,163 +55,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,159 +55,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27014,12 +26673,12 @@ index 298c08b4189f..60b8bdd048ee 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
@@ -27044,35 +26703,31 @@ index 298c08b4189f..60b8bdd048ee 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["TARGET_CPU"] == "x86_64":
CXXFLAGS += [
-- "-msse2",
"-msse2"
]
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- CXXFLAGS += [
+- "-msse2",
+- "-msse2"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+- CXXFLAGS += [
- "-msse2"
- ]
+ DEFINES["USE_X11"] = "1"
Library("common_audio_sse2_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index 699fdd026734..8c94cafaea8c 100644
+index e5cef248325a..8c94cafaea8c 100644
--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27097,7 +26752,7 @@ index 699fdd026734..8c94cafaea8c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27258,7 +26913,6 @@ index 699fdd026734..8c94cafaea8c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -27268,10 +26922,6 @@ index 699fdd026734..8c94cafaea8c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -27299,7 +26949,7 @@ index 699fdd026734..8c94cafaea8c 100644
Library("fir_filter_factory_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index b0236d1067a1..a2f52d00f787 100644
+index 4140a3529209..a2f52d00f787 100644
--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27433,7 +27083,7 @@ index b0236d1067a1..a2f52d00f787 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27465,16 +27115,9 @@ index b0236d1067a1..a2f52d00f787 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -27493,7 +27136,7 @@ index b0236d1067a1..a2f52d00f787 100644
-
Library("fir_filter_gn")
diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index cda88c03f924..920ecc6786e2 100644
+index ec0b21c2fc07..920ecc6786e2 100644
--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27642,7 +27285,7 @@ index cda88c03f924..920ecc6786e2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27674,16 +27317,9 @@ index cda88c03f924..920ecc6786e2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -27702,7 +27338,7 @@ index cda88c03f924..920ecc6786e2 100644
-
Library("sinc_resampler_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index 328c77410ca2..6516aa36e738 100644
+index 6efbe87f02e4..6516aa36e738 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27830,7 +27466,7 @@ index 328c77410ca2..6516aa36e738 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -148,133 +64,42 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,128 +64,42 @@ if CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
]
@@ -27905,7 +27541,6 @@ index 328c77410ca2..6516aa36e738 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -27916,10 +27551,6 @@ index 328c77410ca2..6516aa36e738 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64":
-
- CXXFLAGS += [
@@ -27974,7 +27605,7 @@ index 328c77410ca2..6516aa36e738 100644
Library("fft_size_128_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-index e65c7c572fc8..e684b91a0664 100644
+index d1e512c383fe..e684b91a0664 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27999,7 +27630,7 @@ index e65c7c572fc8..e684b91a0664 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28145,7 +27776,6 @@ index e65c7c572fc8..e684b91a0664 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -28155,10 +27785,6 @@ index e65c7c572fc8..e684b91a0664 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -28186,7 +27812,7 @@ index e65c7c572fc8..e684b91a0664 100644
Library("fft_size_256_gn")
diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index 618af60da3be..bfb7cde7d729 100644
+index 718ca3b4e8a9..bfb7cde7d729 100644
--- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28343,7 +27969,7 @@ index 618af60da3be..bfb7cde7d729 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-@@ -171,107 +81,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -171,102 +81,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
@@ -28389,7 +28015,6 @@ index 618af60da3be..bfb7cde7d729 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -28400,10 +28025,6 @@ index 618af60da3be..bfb7cde7d729 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
- ]
@@ -28459,7 +28080,7 @@ index 618af60da3be..bfb7cde7d729 100644
Library("spl_sqrt_floor_gn")
diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index a767c9c76531..aaaed70ce9a2 100644
+index 4572d78fab12..aaaed70ce9a2 100644
--- third_party/libwebrtc/common_video/common_video_gn/moz.build
+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28484,7 +28105,7 @@ index a767c9c76531..aaaed70ce9a2 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,185 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28641,7 +28262,6 @@ index a767c9c76531..aaaed70ce9a2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -28651,10 +28271,6 @@ index a767c9c76531..aaaed70ce9a2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -28682,7 +28298,7 @@ index a767c9c76531..aaaed70ce9a2 100644
Library("common_video_gn")
diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index 0ccbf9ac7636..b83174b75ce7 100644
+index 0727032aea53..b83174b75ce7 100644
--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28816,7 +28432,7 @@ index 0ccbf9ac7636..b83174b75ce7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -28848,16 +28464,9 @@ index 0ccbf9ac7636..b83174b75ce7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -28876,7 +28485,7 @@ index 0ccbf9ac7636..b83174b75ce7 100644
-
Library("frame_counts_gn")
diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index 7aa4e9bfff47..ecc27ae7537e 100644
+index 1b9792fe565e..ecc27ae7537e 100644
--- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
+++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28901,7 +28510,7 @@ index 7aa4e9bfff47..ecc27ae7537e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29051,7 +28660,6 @@ index 7aa4e9bfff47..ecc27ae7537e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -29061,10 +28669,6 @@ index 7aa4e9bfff47..ecc27ae7537e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29092,7 +28696,7 @@ index 7aa4e9bfff47..ecc27ae7537e 100644
Library("generic_frame_descriptor_gn")
diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index 023dd46dd1ee..c4bdc6ec5e67 100644
+index f2614358531f..c4bdc6ec5e67 100644
--- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
+++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29226,7 +28830,7 @@ index 023dd46dd1ee..c4bdc6ec5e67 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29258,16 +28862,9 @@ index 023dd46dd1ee..c4bdc6ec5e67 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29300,7 +28897,7 @@ index 2f9f14acb430..f8143d2798f0 100644
-
Library("registered_field_trials_header_gn")
diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index f4f41e48ae54..5286d0893211 100644
+index 806981ed688c..5286d0893211 100644
--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29325,7 +28922,7 @@ index f4f41e48ae54..5286d0893211 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,185 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29482,7 +29079,6 @@ index f4f41e48ae54..5286d0893211 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -29492,10 +29088,6 @@ index f4f41e48ae54..5286d0893211 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29523,7 +29115,7 @@ index f4f41e48ae54..5286d0893211 100644
Library("rtc_event_audio_gn")
diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index 72e02793f70c..c9e2dbbd60a6 100644
+index d1f1deac9a5a..c9e2dbbd60a6 100644
--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29548,7 +29140,7 @@ index 72e02793f70c..c9e2dbbd60a6 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,185 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29705,7 +29297,6 @@ index 72e02793f70c..c9e2dbbd60a6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -29715,10 +29306,6 @@ index 72e02793f70c..c9e2dbbd60a6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29746,7 +29333,7 @@ index 72e02793f70c..c9e2dbbd60a6 100644
Library("rtc_event_bwe_gn")
diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-index 6a37b25112a8..e03e19ffe137 100644
+index 2c6740f28f86..e03e19ffe137 100644
--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29771,7 +29358,7 @@ index 6a37b25112a8..e03e19ffe137 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29928,7 +29515,6 @@ index 6a37b25112a8..e03e19ffe137 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -29938,10 +29524,6 @@ index 6a37b25112a8..e03e19ffe137 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -29969,7 +29551,7 @@ index 6a37b25112a8..e03e19ffe137 100644
Library("rtc_event_field_gn")
diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-index 5ad6834dff13..a2cfdaa1e322 100644
+index 2936d8ef48a0..a2cfdaa1e322 100644
--- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30107,7 +29689,7 @@ index 5ad6834dff13..a2cfdaa1e322 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -30139,16 +29721,9 @@ index 5ad6834dff13..a2cfdaa1e322 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -30167,7 +29742,7 @@ index 5ad6834dff13..a2cfdaa1e322 100644
-
Library("rtc_event_log_parse_status_gn")
diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-index af4c0bf656d0..ccdfd183ece3 100644
+index 6ecf9077cf03..ccdfd183ece3 100644
--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30192,7 +29767,7 @@ index af4c0bf656d0..ccdfd183ece3 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,178 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30342,7 +29917,6 @@ index af4c0bf656d0..ccdfd183ece3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -30352,10 +29926,6 @@ index af4c0bf656d0..ccdfd183ece3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -30383,7 +29953,7 @@ index af4c0bf656d0..ccdfd183ece3 100644
Library("rtc_event_number_encodings_gn")
diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index abf04bb09f55..76f4e6aaf79d 100644
+index f0e8d5d4e8ed..76f4e6aaf79d 100644
--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30408,7 +29978,7 @@ index abf04bb09f55..76f4e6aaf79d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30565,7 +30135,6 @@ index abf04bb09f55..76f4e6aaf79d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -30575,10 +30144,6 @@ index abf04bb09f55..76f4e6aaf79d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -30606,7 +30171,7 @@ index abf04bb09f55..76f4e6aaf79d 100644
Library("rtc_event_pacing_gn")
diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index b003d287bd3b..c36201f6936f 100644
+index 082924c2d04a..c36201f6936f 100644
--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30631,7 +30196,7 @@ index b003d287bd3b..c36201f6936f 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,194 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30792,7 +30357,6 @@ index b003d287bd3b..c36201f6936f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -30802,10 +30366,6 @@ index b003d287bd3b..c36201f6936f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -30833,7 +30393,7 @@ index b003d287bd3b..c36201f6936f 100644
Library("rtc_event_rtp_rtcp_gn")
diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index 264fc2cf4b44..ce50ff600882 100644
+index 6e74aef635a8..ce50ff600882 100644
--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30858,7 +30418,7 @@ index 264fc2cf4b44..ce50ff600882 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31015,7 +30575,6 @@ index 264fc2cf4b44..ce50ff600882 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -31025,10 +30584,6 @@ index 264fc2cf4b44..ce50ff600882 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31056,7 +30611,7 @@ index 264fc2cf4b44..ce50ff600882 100644
Library("rtc_event_video_gn")
diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index eb3342a9262b..554779329f71 100644
+index 935bf8bbf982..554779329f71 100644
--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31081,7 +30636,7 @@ index eb3342a9262b..554779329f71 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31238,7 +30793,6 @@ index eb3342a9262b..554779329f71 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -31248,10 +30802,6 @@ index eb3342a9262b..554779329f71 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31279,7 +30829,7 @@ index eb3342a9262b..554779329f71 100644
Library("rtc_stream_config_gn")
diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index a6fa3b406360..0e5621e98050 100644
+index b5ebd454d311..0e5621e98050 100644
--- third_party/libwebrtc/media/codec_gn/moz.build
+++ third_party/libwebrtc/media/codec_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31304,7 +30854,7 @@ index a6fa3b406360..0e5621e98050 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31461,7 +31011,6 @@ index a6fa3b406360..0e5621e98050 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -31471,10 +31020,6 @@ index a6fa3b406360..0e5621e98050 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31502,7 +31047,7 @@ index a6fa3b406360..0e5621e98050 100644
Library("codec_gn")
diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index 1bedb41bf2af..dc7b58e842ae 100644
+index c6653685687c..dc7b58e842ae 100644
--- third_party/libwebrtc/media/media_channel_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31652,7 +31197,7 @@ index 1bedb41bf2af..dc7b58e842ae 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31684,16 +31229,9 @@ index 1bedb41bf2af..dc7b58e842ae 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31712,7 +31250,7 @@ index 1bedb41bf2af..dc7b58e842ae 100644
-
Library("media_channel_gn")
diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-index 7d0a4bd6506d..172ee56822ee 100644
+index 27bfa53fffd8..172ee56822ee 100644
--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31846,7 +31384,7 @@ index 7d0a4bd6506d..172ee56822ee 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31878,16 +31416,9 @@ index 7d0a4bd6506d..172ee56822ee 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -31906,7 +31437,7 @@ index 7d0a4bd6506d..172ee56822ee 100644
-
Library("media_channel_impl_gn")
diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
-index af4cd6b257f8..f824cfa02a97 100644
+index 95a0c3a056ad..f824cfa02a97 100644
--- third_party/libwebrtc/media/media_constants_gn/moz.build
+++ third_party/libwebrtc/media/media_constants_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31931,7 +31462,7 @@ index af4cd6b257f8..f824cfa02a97 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32077,7 +31608,6 @@ index af4cd6b257f8..f824cfa02a97 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -32087,10 +31617,6 @@ index af4cd6b257f8..f824cfa02a97 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -32118,7 +31644,7 @@ index af4cd6b257f8..f824cfa02a97 100644
Library("media_constants_gn")
diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 61afeec94597..5002ea1e568b 100644
+index 944901a1ca8b..5002ea1e568b 100644
--- third_party/libwebrtc/media/rid_description_gn/moz.build
+++ third_party/libwebrtc/media/rid_description_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32252,7 +31778,7 @@ index 61afeec94597..5002ea1e568b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32284,16 +31810,9 @@ index 61afeec94597..5002ea1e568b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -32312,7 +31831,7 @@ index 61afeec94597..5002ea1e568b 100644
-
Library("rid_description_gn")
diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index cfff6f34114e..a8cbb815b3dc 100644
+index a5b3661adc45..a8cbb815b3dc 100644
--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32337,7 +31856,7 @@ index cfff6f34114e..a8cbb815b3dc 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,195 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32499,7 +32018,6 @@ index cfff6f34114e..a8cbb815b3dc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -32509,10 +32027,6 @@ index cfff6f34114e..a8cbb815b3dc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -32540,7 +32054,7 @@ index cfff6f34114e..a8cbb815b3dc 100644
Library("rtc_media_base_gn")
diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index 17afebe8da99..5f7ef130f434 100644
+index 8f3f81cc5b25..5f7ef130f434 100644
--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32674,7 +32188,7 @@ index 17afebe8da99..5f7ef130f434 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32706,16 +32220,9 @@ index 17afebe8da99..5f7ef130f434 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -32734,7 +32241,7 @@ index 17afebe8da99..5f7ef130f434 100644
-
Library("rtc_media_config_gn")
diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index c09703ddd6a2..d923f1e5407f 100644
+index 6b1032e1b0d5..d923f1e5407f 100644
--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32759,7 +32266,7 @@ index c09703ddd6a2..d923f1e5407f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32921,7 +32428,6 @@ index c09703ddd6a2..d923f1e5407f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -32931,10 +32437,6 @@ index c09703ddd6a2..d923f1e5407f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -32962,7 +32464,7 @@ index c09703ddd6a2..d923f1e5407f 100644
Library("rtc_simulcast_encoder_adapter_gn")
diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
-index 1aaa347151a2..3a5eee57c3c6 100644
+index e2e5c11695a9..3a5eee57c3c6 100644
--- third_party/libwebrtc/media/rtp_utils_gn/moz.build
+++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33096,7 +32598,7 @@ index 1aaa347151a2..3a5eee57c3c6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33128,16 +32630,9 @@ index 1aaa347151a2..3a5eee57c3c6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -33156,7 +32651,7 @@ index 1aaa347151a2..3a5eee57c3c6 100644
-
Library("rtp_utils_gn")
diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
-index 71875c4e0165..4c9a675fed35 100644
+index 1582a42c0d4d..4c9a675fed35 100644
--- third_party/libwebrtc/media/stream_params_gn/moz.build
+++ third_party/libwebrtc/media/stream_params_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33290,7 +32785,7 @@ index 71875c4e0165..4c9a675fed35 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33322,16 +32817,9 @@ index 71875c4e0165..4c9a675fed35 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -33350,7 +32838,7 @@ index 71875c4e0165..4c9a675fed35 100644
-
Library("stream_params_gn")
diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index 347559a342cb..b34d55194ffa 100644
+index dfff9870432d..b34d55194ffa 100644
--- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33375,7 +32863,7 @@ index 347559a342cb..b34d55194ffa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33532,7 +33020,6 @@ index 347559a342cb..b34d55194ffa 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -33542,10 +33029,6 @@ index 347559a342cb..b34d55194ffa 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -33573,7 +33056,7 @@ index 347559a342cb..b34d55194ffa 100644
Library("async_audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 4dad1217d030..1beb494d070e 100644
+index 88fa77a0e25d..1beb494d070e 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33598,7 +33081,7 @@ index 4dad1217d030..1beb494d070e 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,194 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33759,7 +33242,6 @@ index 4dad1217d030..1beb494d070e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -33769,10 +33251,6 @@ index 4dad1217d030..1beb494d070e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -33800,7 +33278,7 @@ index 4dad1217d030..1beb494d070e 100644
Library("audio_coding_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 704026c84512..662101a6da02 100644
+index 851dd7b58ea3..662101a6da02 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33934,7 +33412,7 @@ index 704026c84512..662101a6da02 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33966,16 +33444,9 @@ index 704026c84512..662101a6da02 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -33994,7 +33465,7 @@ index 704026c84512..662101a6da02 100644
-
Library("audio_coding_module_typedefs_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index bbb1557baa57..07e4babacbee 100644
+index e509916cfd65..07e4babacbee 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34019,7 +33490,7 @@ index bbb1557baa57..07e4babacbee 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34176,7 +33647,6 @@ index bbb1557baa57..07e4babacbee 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -34186,10 +33656,6 @@ index bbb1557baa57..07e4babacbee 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -34217,7 +33683,7 @@ index bbb1557baa57..07e4babacbee 100644
Library("audio_coding_opus_common_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index 75153f32214b..7e607a103229 100644
+index 782941906573..7e607a103229 100644
--- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34242,7 +33708,7 @@ index 75153f32214b..7e607a103229 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34403,7 +33869,6 @@ index 75153f32214b..7e607a103229 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -34413,10 +33878,6 @@ index 75153f32214b..7e607a103229 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -34444,7 +33905,7 @@ index 75153f32214b..7e607a103229 100644
Library("audio_encoder_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index b9d3c55453a7..af6c05a7ac37 100644
+index de87e8b03398..af6c05a7ac37 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34469,7 +33930,7 @@ index b9d3c55453a7..af6c05a7ac37 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34615,7 +34076,6 @@ index b9d3c55453a7..af6c05a7ac37 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -34625,10 +34085,6 @@ index b9d3c55453a7..af6c05a7ac37 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -34656,7 +34112,7 @@ index b9d3c55453a7..af6c05a7ac37 100644
Library("audio_network_adaptor_config_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 7d446965f130..2bc0c19c36ad 100644
+index 8a371a9aaf33..2bc0c19c36ad 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34681,7 +34137,7 @@ index 7d446965f130..2bc0c19c36ad 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,194 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,189 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34842,7 +34298,6 @@ index 7d446965f130..2bc0c19c36ad 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -34852,10 +34307,6 @@ index 7d446965f130..2bc0c19c36ad 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -34883,7 +34334,7 @@ index 7d446965f130..2bc0c19c36ad 100644
Library("audio_network_adaptor_gn")
diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-index aea0a80ed4fa..f37caf681b50 100644
+index d7928549d7d4..f37caf681b50 100644
--- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34908,7 +34359,7 @@ index aea0a80ed4fa..f37caf681b50 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35069,7 +34520,6 @@ index aea0a80ed4fa..f37caf681b50 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -35079,10 +34529,6 @@ index aea0a80ed4fa..f37caf681b50 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35110,7 +34556,7 @@ index aea0a80ed4fa..f37caf681b50 100644
Library("default_neteq_factory_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index 575478702e32..ca3e24ca4b66 100644
+index bedb8fc4771d..ca3e24ca4b66 100644
--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35135,7 +34581,7 @@ index 575478702e32..ca3e24ca4b66 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35281,7 +34727,6 @@ index 575478702e32..ca3e24ca4b66 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -35291,10 +34736,6 @@ index 575478702e32..ca3e24ca4b66 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35322,7 +34763,7 @@ index 575478702e32..ca3e24ca4b66 100644
Library("g711_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index fa25fde0bd42..5ca4c8481054 100644
+index 103d89c6d88f..5ca4c8481054 100644
--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35347,7 +34788,7 @@ index fa25fde0bd42..5ca4c8481054 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35504,7 +34945,6 @@ index fa25fde0bd42..5ca4c8481054 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -35514,10 +34954,6 @@ index fa25fde0bd42..5ca4c8481054 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35545,7 +34981,7 @@ index fa25fde0bd42..5ca4c8481054 100644
Library("g711_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index 4821c2bd8267..b91e6ceef362 100644
+index 48137ada8562..b91e6ceef362 100644
--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35570,7 +35006,7 @@ index 4821c2bd8267..b91e6ceef362 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35716,7 +35152,6 @@ index 4821c2bd8267..b91e6ceef362 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -35726,10 +35161,6 @@ index 4821c2bd8267..b91e6ceef362 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35757,7 +35188,7 @@ index 4821c2bd8267..b91e6ceef362 100644
Library("g722_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index 0a56f32af0b5..1023ae364204 100644
+index 81eb8704662b..1023ae364204 100644
--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35782,7 +35213,7 @@ index 0a56f32af0b5..1023ae364204 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35939,7 +35370,6 @@ index 0a56f32af0b5..1023ae364204 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -35949,10 +35379,6 @@ index 0a56f32af0b5..1023ae364204 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -35980,7 +35406,7 @@ index 0a56f32af0b5..1023ae364204 100644
Library("g722_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-index 43d69c766282..a4630b7e5435 100644
+index d3aa4e00180f..a4630b7e5435 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36005,7 +35431,7 @@ index 43d69c766282..a4630b7e5435 100644
FINAL_LIBRARY = "webrtc"
-@@ -111,194 +121,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -111,189 +121,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36166,7 +35592,6 @@ index 43d69c766282..a4630b7e5435 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -36176,10 +35601,6 @@ index 43d69c766282..a4630b7e5435 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36207,7 +35628,7 @@ index 43d69c766282..a4630b7e5435 100644
Library("ilbc_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-index c4b3b4cd1309..4a8e42c833db 100644
+index 9a397a1fdcf7..4a8e42c833db 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36232,7 +35653,7 @@ index c4b3b4cd1309..4a8e42c833db 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36393,7 +35814,6 @@ index c4b3b4cd1309..4a8e42c833db 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -36403,10 +35823,6 @@ index c4b3b4cd1309..4a8e42c833db 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36434,7 +35850,7 @@ index c4b3b4cd1309..4a8e42c833db 100644
Library("ilbc_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index 4f4a5c0e7e9b..dc793c09c02f 100644
+index fdfc4fc85541..dc793c09c02f 100644
--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36568,7 +35984,7 @@ index 4f4a5c0e7e9b..dc793c09c02f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36600,16 +36016,9 @@ index 4f4a5c0e7e9b..dc793c09c02f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36628,7 +36037,7 @@ index 4f4a5c0e7e9b..dc793c09c02f 100644
-
Library("isac_bwinfo_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index a5cc52279a9f..cab48c87fd99 100644
+index 1b599c5e5148..cab48c87fd99 100644
--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36653,7 +36062,7 @@ index a5cc52279a9f..cab48c87fd99 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,174 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36799,7 +36208,6 @@ index a5cc52279a9f..cab48c87fd99 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -36809,10 +36217,6 @@ index a5cc52279a9f..cab48c87fd99 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -36840,7 +36244,7 @@ index a5cc52279a9f..cab48c87fd99 100644
Library("isac_vad_gn")
diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index 78b7338ddd81..cac379b6b793 100644
+index b884cb8d99d1..cac379b6b793 100644
--- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36865,7 +36269,7 @@ index 78b7338ddd81..cac379b6b793 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37022,7 +36426,6 @@ index 78b7338ddd81..cac379b6b793 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -37032,10 +36435,6 @@ index 78b7338ddd81..cac379b6b793 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37063,7 +36462,7 @@ index 78b7338ddd81..cac379b6b793 100644
Library("legacy_encoded_audio_frame_gn")
diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index 04dbb0327974..57d0a614a954 100644
+index 834a8d1265d4..57d0a614a954 100644
--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37088,7 +36487,7 @@ index 04dbb0327974..57d0a614a954 100644
FINAL_LIBRARY = "webrtc"
-@@ -78,194 +88,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -78,189 +88,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37249,7 +36648,6 @@ index 04dbb0327974..57d0a614a954 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -37259,10 +36657,6 @@ index 04dbb0327974..57d0a614a954 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37290,7 +36684,7 @@ index 04dbb0327974..57d0a614a954 100644
Library("neteq_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 41f722069cde..929298145fe6 100644
+index ef0c150cb8b7..929298145fe6 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37315,7 +36709,7 @@ index 41f722069cde..929298145fe6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37461,7 +36855,6 @@ index 41f722069cde..929298145fe6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -37471,10 +36864,6 @@ index 41f722069cde..929298145fe6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37502,7 +36891,7 @@ index 41f722069cde..929298145fe6 100644
Library("pcm16b_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index ed96e7c0f8b8..f2c0266976ea 100644
+index a1d9c8009d63..f2c0266976ea 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37527,7 +36916,7 @@ index ed96e7c0f8b8..f2c0266976ea 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37684,7 +37073,6 @@ index ed96e7c0f8b8..f2c0266976ea 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -37694,10 +37082,6 @@ index ed96e7c0f8b8..f2c0266976ea 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37725,7 +37109,7 @@ index ed96e7c0f8b8..f2c0266976ea 100644
Library("pcm16b_gn")
diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index 479cf67a2a66..7f59f0ce2a61 100644
+index ab0d8129bb7d..7f59f0ce2a61 100644
--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37750,7 +37134,7 @@ index 479cf67a2a66..7f59f0ce2a61 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37911,7 +37295,6 @@ index 479cf67a2a66..7f59f0ce2a61 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -37921,10 +37304,6 @@ index 479cf67a2a66..7f59f0ce2a61 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -37952,7 +37331,7 @@ index 479cf67a2a66..7f59f0ce2a61 100644
Library("red_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index a8a6c576e22b..644ed46e25af 100644
+index d077aaa930c2..644ed46e25af 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37977,7 +37356,7 @@ index a8a6c576e22b..644ed46e25af 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38138,7 +37517,6 @@ index a8a6c576e22b..644ed46e25af 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -38148,10 +37526,6 @@ index a8a6c576e22b..644ed46e25af 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38179,7 +37553,7 @@ index a8a6c576e22b..644ed46e25af 100644
Library("webrtc_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index 491f0cc543ac..2cdd2e8966cc 100644
+index d48fd6817440..2cdd2e8966cc 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
@@ -12,14 +12,24 @@ AllowCompilerWarnings()
@@ -38207,7 +37581,7 @@ index 491f0cc543ac..2cdd2e8966cc 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,185 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38364,7 +37738,6 @@ index 491f0cc543ac..2cdd2e8966cc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -38374,10 +37747,6 @@ index 491f0cc543ac..2cdd2e8966cc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38405,7 +37774,7 @@ index 491f0cc543ac..2cdd2e8966cc 100644
Library("webrtc_multiopus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index e2c57b99afb1..b9964a572e72 100644
+index 02986beaa4e3..b9964a572e72 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
@@ -12,14 +12,24 @@ AllowCompilerWarnings()
@@ -38433,7 +37802,7 @@ index e2c57b99afb1..b9964a572e72 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,194 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,189 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38594,7 +37963,6 @@ index e2c57b99afb1..b9964a572e72 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -38604,10 +37972,6 @@ index e2c57b99afb1..b9964a572e72 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38635,7 +37999,7 @@ index e2c57b99afb1..b9964a572e72 100644
Library("webrtc_opus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index 268854264f5b..75cf2ac66f90 100644
+index e6c31b48b55c..75cf2ac66f90 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
@@ -12,14 +12,24 @@ AllowCompilerWarnings()
@@ -38663,7 +38027,7 @@ index 268854264f5b..75cf2ac66f90 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,185 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38820,7 +38184,6 @@ index 268854264f5b..75cf2ac66f90 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -38830,10 +38193,6 @@ index 268854264f5b..75cf2ac66f90 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -38861,7 +38220,7 @@ index 268854264f5b..75cf2ac66f90 100644
Library("webrtc_opus_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index df00e056c677..9c87f7c0eb47 100644
+index 4128efbbf853..9c87f7c0eb47 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -38995,7 +38354,7 @@ index df00e056c677..9c87f7c0eb47 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39027,16 +38386,9 @@ index df00e056c677..9c87f7c0eb47 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39055,7 +38407,7 @@ index df00e056c677..9c87f7c0eb47 100644
-
Library("audio_device_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index edfac56a3a52..76eea8d6f4b7 100644
+index cc60512cdabe..76eea8d6f4b7 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -39080,7 +38432,7 @@ index edfac56a3a52..76eea8d6f4b7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39241,7 +38593,6 @@ index edfac56a3a52..76eea8d6f4b7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -39251,10 +38602,6 @@ index edfac56a3a52..76eea8d6f4b7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39282,7 +38629,7 @@ index edfac56a3a52..76eea8d6f4b7 100644
Library("audio_frame_manipulator_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 7108d9fbe1c4..7e31717972c2 100644
+index 65959399415c..7e31717972c2 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -39308,7 +38655,7 @@ index 7108d9fbe1c4..7e31717972c2 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,194 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39469,7 +38816,6 @@ index 7108d9fbe1c4..7e31717972c2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -39479,10 +38825,6 @@ index 7108d9fbe1c4..7e31717972c2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39510,7 +38852,7 @@ index 7108d9fbe1c4..7e31717972c2 100644
Library("audio_mixer_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index f21e65fb4a2b..45caaf66c9d3 100644
+index 7435b6a4572e..45caaf66c9d3 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -39648,7 +38990,7 @@ index f21e65fb4a2b..45caaf66c9d3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39680,16 +39022,9 @@ index f21e65fb4a2b..45caaf66c9d3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39708,7 +39043,7 @@ index f21e65fb4a2b..45caaf66c9d3 100644
-
Library("adaptive_fir_filter_erl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index b9c819893ff9..7f00a42dad1a 100644
+index 0d2471073d20..7f00a42dad1a 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -39857,7 +39192,7 @@ index b9c819893ff9..7f00a42dad1a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39889,16 +39224,9 @@ index b9c819893ff9..7f00a42dad1a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -39917,7 +39245,7 @@ index b9c819893ff9..7f00a42dad1a 100644
-
Library("adaptive_fir_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index 097e67bbe502..8581bbea27b3 100644
+index f9844b65210b..8581bbea27b3 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
@@ -17,13 +17,23 @@ CXXFLAGS += [
@@ -39944,7 +39272,7 @@ index 097e67bbe502..8581bbea27b3 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,141 +64,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,137 +64,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40055,12 +39383,12 @@ index 097e67bbe502..8581bbea27b3 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
DEFINES["_DEBUG"] = True
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -40076,10 +39404,6 @@ index 097e67bbe502..8581bbea27b3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
@@ -40090,7 +39414,7 @@ index 097e67bbe502..8581bbea27b3 100644
Library("aec3_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index 955fe2022fd3..644f510a92b4 100644
+index 8d9c4e6bd7f2..644f510a92b4 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40224,7 +39548,7 @@ index 955fe2022fd3..644f510a92b4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40256,16 +39580,9 @@ index 955fe2022fd3..644f510a92b4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -40284,7 +39601,7 @@ index 955fe2022fd3..644f510a92b4 100644
-
Library("aec3_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index 154d9f440665..b39c407de26b 100644
+index d403ae8b96d1..b39c407de26b 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40433,7 +39750,7 @@ index 154d9f440665..b39c407de26b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40465,16 +39782,9 @@ index 154d9f440665..b39c407de26b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -40493,7 +39803,7 @@ index 154d9f440665..b39c407de26b 100644
-
Library("aec3_fft_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 7ad4cffedf28..0ef6f85dcfa2 100644
+index 85e56542311d..0ef6f85dcfa2 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -40519,7 +39829,7 @@ index 7ad4cffedf28..0ef6f85dcfa2 100644
FINAL_LIBRARY = "webrtc"
-@@ -100,194 +110,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -100,189 +110,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40680,7 +39990,6 @@ index 7ad4cffedf28..0ef6f85dcfa2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -40690,10 +39999,6 @@ index 7ad4cffedf28..0ef6f85dcfa2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -40721,7 +40026,7 @@ index 7ad4cffedf28..0ef6f85dcfa2 100644
Library("aec3_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index 0084077435c5..a04b6dc8ae72 100644
+index aa1aaf15d9cf..a04b6dc8ae72 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40859,7 +40164,7 @@ index 0084077435c5..a04b6dc8ae72 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40891,16 +40196,9 @@ index 0084077435c5..a04b6dc8ae72 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -40919,7 +40217,7 @@ index 0084077435c5..a04b6dc8ae72 100644
-
Library("fft_data_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index be2c3bbf56ee..1fb2bf245b0b 100644
+index 0ebdb0798f34..1fb2bf245b0b 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41057,7 +40355,7 @@ index be2c3bbf56ee..1fb2bf245b0b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41089,16 +40387,9 @@ index be2c3bbf56ee..1fb2bf245b0b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41117,7 +40408,7 @@ index be2c3bbf56ee..1fb2bf245b0b 100644
-
Library("matched_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index 2bd3ae0c0132..080f579f017c 100644
+index 6444c3137ffb..080f579f017c 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41255,7 +40546,7 @@ index 2bd3ae0c0132..080f579f017c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41287,16 +40578,9 @@ index 2bd3ae0c0132..080f579f017c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41315,7 +40599,7 @@ index 2bd3ae0c0132..080f579f017c 100644
-
Library("render_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index e40fdb1cf187..8d526768fe2b 100644
+index 9cf3a7842afc..8d526768fe2b 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41453,7 +40737,7 @@ index e40fdb1cf187..8d526768fe2b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41485,16 +40769,9 @@ index e40fdb1cf187..8d526768fe2b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41513,7 +40790,7 @@ index e40fdb1cf187..8d526768fe2b 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index f1280fed0dcb..4fd80b10de2e 100644
+index 13420467de7a..4fd80b10de2e 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41658,7 +40935,7 @@ index f1280fed0dcb..4fd80b10de2e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41690,16 +40967,9 @@ index f1280fed0dcb..4fd80b10de2e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41718,7 +40988,7 @@ index f1280fed0dcb..4fd80b10de2e 100644
-
Library("aec_dump_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index 2966151ab6a6..29c503fd1b35 100644
+index 4e8b16442dd6..29c503fd1b35 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41743,7 +41013,7 @@ index 2966151ab6a6..29c503fd1b35 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41900,7 +41170,6 @@ index 2966151ab6a6..29c503fd1b35 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -41910,10 +41179,6 @@ index 2966151ab6a6..29c503fd1b35 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -41941,7 +41206,7 @@ index 2966151ab6a6..29c503fd1b35 100644
Library("null_aec_dump_factory_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 02b847ed761e..336b06122354 100644
+index 89ae50807341..336b06122354 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41966,7 +41231,7 @@ index 02b847ed761e..336b06122354 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42123,7 +41388,6 @@ index 02b847ed761e..336b06122354 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -42133,10 +41397,6 @@ index 02b847ed761e..336b06122354 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42164,7 +41424,7 @@ index 02b847ed761e..336b06122354 100644
Library("aec_dump_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index 9ff36991fef8..4dec482b58ab 100644
+index ca3ffeb81e25..4dec482b58ab 100644
--- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -42347,7 +41607,7 @@ index 9ff36991fef8..4dec482b58ab 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
-@@ -203,95 +87,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -203,90 +87,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
@@ -42386,7 +41646,6 @@ index 9ff36991fef8..4dec482b58ab 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -42396,10 +41655,6 @@ index 9ff36991fef8..4dec482b58ab 100644
- "-msse2"
- ]
-
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42411,18 +41666,18 @@ index 9ff36991fef8..4dec482b58ab 100644
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
- DEFINES["_GNU_SOURCE"] = True
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+if CONFIG["TARGET_CPU"] == "riscv64":
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
--
-- SOURCES += [
-- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["TARGET_CPU"] == "x86":
@@ -42453,7 +41708,7 @@ index 9ff36991fef8..4dec482b58ab 100644
+
Library("aecm_core_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index f6f4442cfc84..0bf849711117 100644
+index f26489f41313..0bf849711117 100644
--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -42479,7 +41734,7 @@ index f6f4442cfc84..0bf849711117 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42640,7 +41895,6 @@ index f6f4442cfc84..0bf849711117 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -42650,10 +41904,6 @@ index f6f4442cfc84..0bf849711117 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42681,7 +41931,7 @@ index f6f4442cfc84..0bf849711117 100644
Library("agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index be6b4f9b27f5..81bfd7afd255 100644
+index ebf241f7a5db..81bfd7afd255 100644
--- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -42815,7 +42065,7 @@ index be6b4f9b27f5..81bfd7afd255 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42847,16 +42097,9 @@ index be6b4f9b27f5..81bfd7afd255 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -42875,7 +42118,7 @@ index be6b4f9b27f5..81bfd7afd255 100644
-
Library("gain_control_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index 4e6e295d34a8..7780faadc89c 100644
+index aa5c6835cc92..7780faadc89c 100644
--- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -42900,7 +42143,7 @@ index 4e6e295d34a8..7780faadc89c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43061,7 +42304,6 @@ index 4e6e295d34a8..7780faadc89c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -43071,10 +42313,6 @@ index 4e6e295d34a8..7780faadc89c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -43102,7 +42340,7 @@ index 4e6e295d34a8..7780faadc89c 100644
Library("legacy_agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index 64ffa7596019..6a905df4ed20 100644
+index a27255566212..6a905df4ed20 100644
--- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43127,7 +42365,7 @@ index 64ffa7596019..6a905df4ed20 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43288,7 +42526,6 @@ index 64ffa7596019..6a905df4ed20 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -43298,10 +42535,6 @@ index 64ffa7596019..6a905df4ed20 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -43329,7 +42562,7 @@ index 64ffa7596019..6a905df4ed20 100644
Library("level_estimation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-index 9473ac62f52b..2c59f64717cf 100644
+index 5e3b5801ad2e..2c59f64717cf 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -43355,7 +42588,7 @@ index 9473ac62f52b..2c59f64717cf 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43516,7 +42749,6 @@ index 9473ac62f52b..2c59f64717cf 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -43526,10 +42758,6 @@ index 9473ac62f52b..2c59f64717cf 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -43557,7 +42785,7 @@ index 9473ac62f52b..2c59f64717cf 100644
Library("adaptive_digital_gain_controller_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index c7a2f6d21536..c8a383c619f6 100644
+index d9520efe2fad..c8a383c619f6 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43582,7 +42810,7 @@ index c7a2f6d21536..c8a383c619f6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43732,7 +42960,6 @@ index c7a2f6d21536..c8a383c619f6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -43742,10 +42969,6 @@ index c7a2f6d21536..c8a383c619f6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -43773,7 +42996,7 @@ index c7a2f6d21536..c8a383c619f6 100644
Library("biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-index e70e3f68e936..8859fbd93187 100644
+index dbf53e8e8edd..8859fbd93187 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43798,7 +43021,7 @@ index e70e3f68e936..8859fbd93187 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43959,7 +43182,6 @@ index e70e3f68e936..8859fbd93187 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -43969,10 +43191,6 @@ index e70e3f68e936..8859fbd93187 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44000,7 +43218,7 @@ index e70e3f68e936..8859fbd93187 100644
Library("clipping_predictor_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 869061354209..bd6ed025dd1e 100644
+index 44307f414752..bd6ed025dd1e 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44134,7 +43352,7 @@ index 869061354209..bd6ed025dd1e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44166,16 +43384,9 @@ index 869061354209..bd6ed025dd1e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44194,7 +43405,7 @@ index 869061354209..bd6ed025dd1e 100644
-
Library("common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index 4b0431db1a98..638f16d62cad 100644
+index e842cac9c346..638f16d62cad 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44219,7 +43430,7 @@ index 4b0431db1a98..638f16d62cad 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44380,7 +43591,6 @@ index 4b0431db1a98..638f16d62cad 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -44390,10 +43600,6 @@ index 4b0431db1a98..638f16d62cad 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44421,7 +43627,7 @@ index 4b0431db1a98..638f16d62cad 100644
Library("cpu_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index 1b8da82f5817..0dc44f1fda4d 100644
+index 60614d4cc1af..0dc44f1fda4d 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -44447,7 +43653,7 @@ index 1b8da82f5817..0dc44f1fda4d 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,194 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44608,7 +43814,6 @@ index 1b8da82f5817..0dc44f1fda4d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -44618,10 +43823,6 @@ index 1b8da82f5817..0dc44f1fda4d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44649,7 +43850,7 @@ index 1b8da82f5817..0dc44f1fda4d 100644
Library("fixed_digital_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index bea71dcee3e5..c8dc6b50f073 100644
+index 691900e3567c..c8dc6b50f073 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44674,7 +43875,7 @@ index bea71dcee3e5..c8dc6b50f073 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44824,7 +44025,6 @@ index bea71dcee3e5..c8dc6b50f073 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -44834,10 +44034,6 @@ index bea71dcee3e5..c8dc6b50f073 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -44865,7 +44061,7 @@ index bea71dcee3e5..c8dc6b50f073 100644
Library("gain_applier_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-index 03eb1fb3a1df..910e1f47a627 100644
+index ee04e973fbc1..910e1f47a627 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44999,7 +44195,7 @@ index 03eb1fb3a1df..910e1f47a627 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45031,16 +44227,9 @@ index 03eb1fb3a1df..910e1f47a627 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45059,7 +44248,7 @@ index 03eb1fb3a1df..910e1f47a627 100644
-
Library("gain_map_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-index f1a841d5aee9..ae8b8ea97657 100644
+index 0bde4db9d450..ae8b8ea97657 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -45085,7 +44274,7 @@ index f1a841d5aee9..ae8b8ea97657 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45246,7 +44435,6 @@ index f1a841d5aee9..ae8b8ea97657 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -45256,10 +44444,6 @@ index f1a841d5aee9..ae8b8ea97657 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45287,7 +44471,7 @@ index f1a841d5aee9..ae8b8ea97657 100644
Library("input_volume_controller_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-index 40448f68a9d2..d92108c59272 100644
+index b7d0a9ba8891..d92108c59272 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -45312,7 +44496,7 @@ index 40448f68a9d2..d92108c59272 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45469,7 +44653,6 @@ index 40448f68a9d2..d92108c59272 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -45479,10 +44662,6 @@ index 40448f68a9d2..d92108c59272 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45510,7 +44689,7 @@ index 40448f68a9d2..d92108c59272 100644
Library("input_volume_stats_reporter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 9d4629e9abeb..2057bc49645f 100644
+index 210539ab46ff..2057bc49645f 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -45536,7 +44715,7 @@ index 9d4629e9abeb..2057bc49645f 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45697,7 +44876,6 @@ index 9d4629e9abeb..2057bc49645f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -45707,10 +44885,6 @@ index 9d4629e9abeb..2057bc49645f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45738,7 +44912,7 @@ index 9d4629e9abeb..2057bc49645f 100644
Library("noise_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index 134ffac5fd31..a6688f3d2880 100644
+index 7965a026ef10..a6688f3d2880 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -45763,7 +44937,7 @@ index 134ffac5fd31..a6688f3d2880 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45924,7 +45098,6 @@ index 134ffac5fd31..a6688f3d2880 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -45934,10 +45107,6 @@ index 134ffac5fd31..a6688f3d2880 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -45965,7 +45134,7 @@ index 134ffac5fd31..a6688f3d2880 100644
Library("rnn_vad_auto_correlation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index cf3de48a578a..7a188fed0014 100644
+index bdfe90cf1641..7a188fed0014 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46114,7 +45283,7 @@ index cf3de48a578a..7a188fed0014 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46146,16 +45315,9 @@ index cf3de48a578a..7a188fed0014 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -46174,7 +45336,7 @@ index cf3de48a578a..7a188fed0014 100644
-
Library("rnn_vad_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index dbb926c5fcb6..06b7c1408598 100644
+index 6a73ce96e470..06b7c1408598 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46199,7 +45361,7 @@ index dbb926c5fcb6..06b7c1408598 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46360,7 +45522,6 @@ index dbb926c5fcb6..06b7c1408598 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -46370,10 +45531,6 @@ index dbb926c5fcb6..06b7c1408598 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -46401,7 +45558,7 @@ index dbb926c5fcb6..06b7c1408598 100644
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index 92da260f905a..23a0102c4071 100644
+index 27b40f13a545..23a0102c4071 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46426,7 +45583,7 @@ index 92da260f905a..23a0102c4071 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46587,7 +45744,6 @@ index 92da260f905a..23a0102c4071 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -46597,10 +45753,6 @@ index 92da260f905a..23a0102c4071 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -46628,7 +45780,7 @@ index 92da260f905a..23a0102c4071 100644
Library("rnn_vad_layers_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index cedb17bc22b7..58600753bf59 100644
+index d66ed412b2bc..58600753bf59 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46653,7 +45805,7 @@ index cedb17bc22b7..58600753bf59 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46803,7 +45955,6 @@ index cedb17bc22b7..58600753bf59 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -46813,10 +45964,6 @@ index cedb17bc22b7..58600753bf59 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -46844,7 +45991,7 @@ index cedb17bc22b7..58600753bf59 100644
Library("rnn_vad_lp_residual_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index d45bc78ff6ae..76f782e606d1 100644
+index 0ddc85f5ac1e..76f782e606d1 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46869,7 +46016,7 @@ index d45bc78ff6ae..76f782e606d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47030,7 +46177,6 @@ index d45bc78ff6ae..76f782e606d1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -47040,10 +46186,6 @@ index d45bc78ff6ae..76f782e606d1 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -47071,7 +46213,7 @@ index d45bc78ff6ae..76f782e606d1 100644
Library("rnn_vad_pitch_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index 20da5f3615d1..aeba82350dcf 100644
+index 25e813a226e6..aeba82350dcf 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -47209,7 +46351,7 @@ index 20da5f3615d1..aeba82350dcf 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47241,16 +46383,9 @@ index 20da5f3615d1..aeba82350dcf 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -47269,7 +46404,7 @@ index 20da5f3615d1..aeba82350dcf 100644
-
Library("rnn_vad_ring_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index b0ba79562e46..941c1d83c87a 100644
+index f54dd88a23c6..941c1d83c87a 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -47407,7 +46542,7 @@ index b0ba79562e46..941c1d83c87a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47439,16 +46574,9 @@ index b0ba79562e46..941c1d83c87a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -47467,7 +46595,7 @@ index b0ba79562e46..941c1d83c87a 100644
-
Library("rnn_vad_sequence_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index 2d8396fa2aa9..d120c6a00f95 100644
+index d8b88047d758..d120c6a00f95 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -47492,7 +46620,7 @@ index 2d8396fa2aa9..d120c6a00f95 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47653,7 +46781,6 @@ index 2d8396fa2aa9..d120c6a00f95 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -47663,10 +46790,6 @@ index 2d8396fa2aa9..d120c6a00f95 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -47694,7 +46817,7 @@ index 2d8396fa2aa9..d120c6a00f95 100644
Library("rnn_vad_spectral_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index 143ba6960c6f..bea61cc9a325 100644
+index 4a3c5bf28b24..bea61cc9a325 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -47832,7 +46955,7 @@ index 143ba6960c6f..bea61cc9a325 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47864,16 +46987,9 @@ index 143ba6960c6f..bea61cc9a325 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -47892,7 +47008,7 @@ index 143ba6960c6f..bea61cc9a325 100644
-
Library("rnn_vad_symmetric_matrix_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index d4dd169f1523..176b86944ca2 100644
+index 01313fa46097..176b86944ca2 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
@@ -17,12 +17,22 @@ CXXFLAGS += [
@@ -47918,7 +47034,7 @@ index d4dd169f1523..176b86944ca2 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,141 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,137 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48029,12 +47145,12 @@ index d4dd169f1523..176b86944ca2 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
DEFINES["_DEBUG"] = True
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -48050,10 +47166,6 @@ index d4dd169f1523..176b86944ca2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
@@ -48064,7 +47176,7 @@ index d4dd169f1523..176b86944ca2 100644
Library("vector_math_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index 09fe0c3d2452..8d526768fe2b 100644
+index 3f889133092c..8d526768fe2b 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -48213,7 +47325,7 @@ index 09fe0c3d2452..8d526768fe2b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48245,16 +47357,9 @@ index 09fe0c3d2452..8d526768fe2b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -48273,7 +47378,7 @@ index 09fe0c3d2452..8d526768fe2b 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-index 6b8def8650b5..7a45c00e5966 100644
+index 6562d840b746..7a45c00e5966 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -48299,7 +47404,7 @@ index 6b8def8650b5..7a45c00e5966 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48460,7 +47565,6 @@ index 6b8def8650b5..7a45c00e5966 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -48470,10 +47574,6 @@ index 6b8def8650b5..7a45c00e5966 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -48501,7 +47601,7 @@ index 6b8def8650b5..7a45c00e5966 100644
Library("saturation_protector_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-index 8f2996fa264e..eee602cf0088 100644
+index 3afaa88450fa..eee602cf0088 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -48527,7 +47627,7 @@ index 8f2996fa264e..eee602cf0088 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48688,7 +47788,6 @@ index 8f2996fa264e..eee602cf0088 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -48698,10 +47797,6 @@ index 8f2996fa264e..eee602cf0088 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -48729,7 +47824,7 @@ index 8f2996fa264e..eee602cf0088 100644
Library("speech_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index 55cfbb60e71d..dbe8fdf62b34 100644
+index 3aa09832b239..dbe8fdf62b34 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -48754,7 +47849,7 @@ index 55cfbb60e71d..dbe8fdf62b34 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48915,7 +48010,6 @@ index 55cfbb60e71d..dbe8fdf62b34 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -48925,10 +48019,6 @@ index 55cfbb60e71d..dbe8fdf62b34 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -48956,7 +48046,7 @@ index 55cfbb60e71d..dbe8fdf62b34 100644
Library("vad_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-index 7a02b7e10c3f..02a5a5977fb2 100644
+index 37e50af014ef..02a5a5977fb2 100644
--- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -48981,7 +48071,7 @@ index 7a02b7e10c3f..02a5a5977fb2 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49138,7 +48228,6 @@ index 7a02b7e10c3f..02a5a5977fb2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -49148,10 +48237,6 @@ index 7a02b7e10c3f..02a5a5977fb2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49179,7 +48264,7 @@ index 7a02b7e10c3f..02a5a5977fb2 100644
Library("api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index 992376cd8a35..7d069ced5f05 100644
+index 53fd9d9f9456..7d069ced5f05 100644
--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -49205,7 +48290,7 @@ index 992376cd8a35..7d069ced5f05 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49366,7 +48451,6 @@ index 992376cd8a35..7d069ced5f05 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -49376,10 +48460,6 @@ index 992376cd8a35..7d069ced5f05 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49407,7 +48487,7 @@ index 992376cd8a35..7d069ced5f05 100644
Library("apm_logging_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index 88031a747de7..07b14b4ad557 100644
+index 2087aeb9093f..07b14b4ad557 100644
--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -49433,7 +48513,7 @@ index 88031a747de7..07b14b4ad557 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,194 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49594,7 +48674,6 @@ index 88031a747de7..07b14b4ad557 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -49604,10 +48683,6 @@ index 88031a747de7..07b14b4ad557 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49635,7 +48710,7 @@ index 88031a747de7..07b14b4ad557 100644
Library("audio_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index 7e73b704838d..244e4b9f1e17 100644
+index 737ca5e83456..244e4b9f1e17 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -49660,7 +48735,7 @@ index 7e73b704838d..244e4b9f1e17 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49817,7 +48892,6 @@ index 7e73b704838d..244e4b9f1e17 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -49827,10 +48901,6 @@ index 7e73b704838d..244e4b9f1e17 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -49858,7 +48928,7 @@ index 7e73b704838d..244e4b9f1e17 100644
Library("audio_frame_proxies_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index 0f8175509182..e6ffd17bd131 100644
+index b7391a78b169..e6ffd17bd131 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -49996,7 +49066,7 @@ index 0f8175509182..e6ffd17bd131 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50028,16 +49098,9 @@ index 0f8175509182..e6ffd17bd131 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50056,7 +49119,7 @@ index 0f8175509182..e6ffd17bd131 100644
-
Library("audio_frame_view_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 7dc22bcf2bdc..2d073c5534c0 100644
+index 5b4f4d5d5446..2d073c5534c0 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -50082,7 +49145,7 @@ index 7dc22bcf2bdc..2d073c5534c0 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,194 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,189 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50243,7 +49306,6 @@ index 7dc22bcf2bdc..2d073c5534c0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -50253,10 +49315,6 @@ index 7dc22bcf2bdc..2d073c5534c0 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50284,7 +49342,7 @@ index 7dc22bcf2bdc..2d073c5534c0 100644
Library("audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-index 6d174505ed03..a1efc9d29d6b 100644
+index 6b3e54c3f7f4..a1efc9d29d6b 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50309,7 +49367,7 @@ index 6d174505ed03..a1efc9d29d6b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50455,7 +49513,6 @@ index 6d174505ed03..a1efc9d29d6b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -50465,10 +49522,6 @@ index 6d174505ed03..a1efc9d29d6b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50496,7 +49549,7 @@ index 6d174505ed03..a1efc9d29d6b 100644
Library("audio_processing_statistics_gn")
diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index d80a3bb1c6d2..2d0cb60d35c2 100644
+index ad198344e2b8..2d0cb60d35c2 100644
--- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50521,7 +49574,7 @@ index d80a3bb1c6d2..2d0cb60d35c2 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50682,7 +49735,6 @@ index d80a3bb1c6d2..2d0cb60d35c2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -50692,10 +49744,6 @@ index d80a3bb1c6d2..2d0cb60d35c2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50723,7 +49771,7 @@ index d80a3bb1c6d2..2d0cb60d35c2 100644
Library("capture_levels_adjuster_gn")
diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index d6d9d3658b8d..2309786d2b1c 100644
+index ab31e685646b..2309786d2b1c 100644
--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -50749,7 +49797,7 @@ index d6d9d3658b8d..2309786d2b1c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50910,7 +49958,6 @@ index d6d9d3658b8d..2309786d2b1c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -50920,10 +49967,6 @@ index d6d9d3658b8d..2309786d2b1c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -50951,7 +49994,7 @@ index d6d9d3658b8d..2309786d2b1c 100644
Library("gain_controller2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index 8769a3a31863..441defcc49c4 100644
+index af06d4142f2e..441defcc49c4 100644
--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50976,7 +50019,7 @@ index 8769a3a31863..441defcc49c4 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51137,7 +50180,6 @@ index 8769a3a31863..441defcc49c4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -51147,10 +50189,6 @@ index 8769a3a31863..441defcc49c4 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51178,7 +50216,7 @@ index 8769a3a31863..441defcc49c4 100644
Library("high_pass_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index 14595abaf908..eb8ba5a7bc73 100644
+index ac1c19134ab7..eb8ba5a7bc73 100644
--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -51204,7 +50242,7 @@ index 14595abaf908..eb8ba5a7bc73 100644
FINAL_LIBRARY = "webrtc"
-@@ -56,194 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,189 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51365,7 +50403,6 @@ index 14595abaf908..eb8ba5a7bc73 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -51375,10 +50412,6 @@ index 14595abaf908..eb8ba5a7bc73 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51406,7 +50439,7 @@ index 14595abaf908..eb8ba5a7bc73 100644
Library("ns_gn")
diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-index af79a781f6de..67ab6a2a8454 100644
+index da2a1b7ae331..67ab6a2a8454 100644
--- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51431,7 +50464,7 @@ index af79a781f6de..67ab6a2a8454 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51592,7 +50625,6 @@ index af79a781f6de..67ab6a2a8454 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -51602,10 +50634,6 @@ index af79a781f6de..67ab6a2a8454 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51633,7 +50661,7 @@ index af79a781f6de..67ab6a2a8454 100644
Library("optionally_built_submodule_creators_gn")
diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index 23f52652aebc..54810dea2903 100644
+index d0c4b2bd8ed0..54810dea2903 100644
--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51658,7 +50686,7 @@ index 23f52652aebc..54810dea2903 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51808,7 +50836,6 @@ index 23f52652aebc..54810dea2903 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -51818,10 +50845,6 @@ index 23f52652aebc..54810dea2903 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -51849,7 +50872,7 @@ index 23f52652aebc..54810dea2903 100644
Library("rms_level_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-index 6310b948ac1f..1ee08a185597 100644
+index 44571715b8e4..1ee08a185597 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51983,7 +51006,7 @@ index 6310b948ac1f..1ee08a185597 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -52015,16 +51038,9 @@ index 6310b948ac1f..1ee08a185597 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52043,7 +51059,7 @@ index 6310b948ac1f..1ee08a185597 100644
-
Library("transient_suppressor_api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-index 31e0736f308e..21fd63ba8c66 100644
+index d700fc1a32bc..21fd63ba8c66 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52068,7 +51084,7 @@ index 31e0736f308e..21fd63ba8c66 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,194 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52229,7 +51245,6 @@ index 31e0736f308e..21fd63ba8c66 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -52239,10 +51254,6 @@ index 31e0736f308e..21fd63ba8c66 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52270,7 +51281,7 @@ index 31e0736f308e..21fd63ba8c66 100644
Library("transient_suppressor_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
-index 52587c089017..a816267ba48b 100644
+index c67675f43128..a816267ba48b 100644
--- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52295,7 +51306,7 @@ index 52587c089017..a816267ba48b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52445,7 +51456,6 @@ index 52587c089017..a816267ba48b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -52455,10 +51465,6 @@ index 52587c089017..a816267ba48b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52486,7 +51492,7 @@ index 52587c089017..a816267ba48b 100644
Library("voice_probability_delay_unit_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index 02813d2513b3..f5811a132b51 100644
+index b6566a8950b5..f5811a132b51 100644
--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52511,7 +51517,7 @@ index 02813d2513b3..f5811a132b51 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52661,7 +51667,6 @@ index 02813d2513b3..f5811a132b51 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -52671,10 +51676,6 @@ index 02813d2513b3..f5811a132b51 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52702,7 +51703,7 @@ index 02813d2513b3..f5811a132b51 100644
Library("cascaded_biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index 67c6a218f6db..c97c6e245e5c 100644
+index c20d5b618927..c97c6e245e5c 100644
--- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52727,7 +51728,7 @@ index 67c6a218f6db..c97c6e245e5c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52877,7 +51878,6 @@ index 67c6a218f6db..c97c6e245e5c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -52887,10 +51887,6 @@ index 67c6a218f6db..c97c6e245e5c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -52918,7 +51914,7 @@ index 67c6a218f6db..c97c6e245e5c 100644
Library("legacy_delay_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 321370600559..c3d938676efc 100644
+index 936decab70ac..c3d938676efc 100644
--- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52943,7 +51939,7 @@ index 321370600559..c3d938676efc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53093,7 +52089,6 @@ index 321370600559..c3d938676efc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -53103,10 +52098,6 @@ index 321370600559..c3d938676efc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53134,7 +52125,7 @@ index 321370600559..c3d938676efc 100644
Library("pffft_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index 3739bbef8afc..951669e227b5 100644
+index 0ae31f5a2e27..951669e227b5 100644
--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -53159,7 +52150,7 @@ index 3739bbef8afc..951669e227b5 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,194 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,189 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53320,7 +52311,6 @@ index 3739bbef8afc..951669e227b5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -53330,10 +52320,6 @@ index 3739bbef8afc..951669e227b5 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53361,7 +52347,7 @@ index 3739bbef8afc..951669e227b5 100644
Library("vad_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index b5bcafa45fbc..ca0e2eb0d4f3 100644
+index 1190193b94b9..ca0e2eb0d4f3 100644
--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53386,7 +52372,7 @@ index b5bcafa45fbc..ca0e2eb0d4f3 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,195 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53548,7 +52534,6 @@ index b5bcafa45fbc..ca0e2eb0d4f3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -53558,10 +52543,6 @@ index b5bcafa45fbc..ca0e2eb0d4f3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53589,7 +52570,7 @@ index b5bcafa45fbc..ca0e2eb0d4f3 100644
Library("congestion_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index b48fc38c398c..7b699b35ae1c 100644
+index 40fd1189aa13..7b699b35ae1c 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -53614,7 +52595,7 @@ index b48fc38c398c..7b699b35ae1c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53771,7 +52752,6 @@ index b48fc38c398c..7b699b35ae1c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -53781,10 +52761,6 @@ index b48fc38c398c..7b699b35ae1c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -53812,7 +52788,7 @@ index b48fc38c398c..7b699b35ae1c 100644
Library("alr_detector_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index 31d8c420f6b6..ef4afa64817b 100644
+index e2087c61261d..ef4afa64817b 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53837,7 +52813,7 @@ index 31d8c420f6b6..ef4afa64817b 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,195 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53999,7 +52975,6 @@ index 31d8c420f6b6..ef4afa64817b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -54009,10 +52984,6 @@ index 31d8c420f6b6..ef4afa64817b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54040,7 +53011,7 @@ index 31d8c420f6b6..ef4afa64817b 100644
Library("delay_based_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index e233806b437f..5d3384990b73 100644
+index 7b77d3dc865c..5d3384990b73 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54065,7 +53036,7 @@ index e233806b437f..5d3384990b73 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,194 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,189 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54226,7 +53197,6 @@ index e233806b437f..5d3384990b73 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -54236,10 +53206,6 @@ index e233806b437f..5d3384990b73 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54267,7 +53233,7 @@ index e233806b437f..5d3384990b73 100644
Library("estimators_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index 147a08113b86..e5abebc8e438 100644
+index 0e5182a469ec..e5abebc8e438 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54292,7 +53258,7 @@ index 147a08113b86..e5abebc8e438 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,195 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54454,7 +53420,6 @@ index 147a08113b86..e5abebc8e438 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -54464,10 +53429,6 @@ index 147a08113b86..e5abebc8e438 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54495,7 +53456,7 @@ index 147a08113b86..e5abebc8e438 100644
Library("goog_cc_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index 0ee8a34df8b9..bf9b47761a6b 100644
+index 04b78b5988c0..bf9b47761a6b 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -54520,7 +53481,7 @@ index 0ee8a34df8b9..bf9b47761a6b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54670,7 +53631,6 @@ index 0ee8a34df8b9..bf9b47761a6b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -54680,10 +53640,6 @@ index 0ee8a34df8b9..bf9b47761a6b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54711,7 +53667,7 @@ index 0ee8a34df8b9..bf9b47761a6b 100644
Library("link_capacity_estimator_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-index 5931292efe33..92f384be816c 100644
+index d290fbe9ecfd..92f384be816c 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54736,7 +53692,7 @@ index 5931292efe33..92f384be816c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54893,7 +53849,6 @@ index 5931292efe33..92f384be816c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -54903,10 +53858,6 @@ index 5931292efe33..92f384be816c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -54934,7 +53885,7 @@ index 5931292efe33..92f384be816c 100644
Library("loss_based_bwe_v1_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index ca9f20ab87e6..3a63a38d3def 100644
+index 709bcdb93719..3a63a38d3def 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -54959,7 +53910,7 @@ index ca9f20ab87e6..3a63a38d3def 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55120,7 +54071,6 @@ index ca9f20ab87e6..3a63a38d3def 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -55130,10 +54080,6 @@ index ca9f20ab87e6..3a63a38d3def 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -55161,7 +54107,7 @@ index ca9f20ab87e6..3a63a38d3def 100644
Library("loss_based_bwe_v2_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index 703c22a59092..e3ef5aa27c28 100644
+index 049ac6f47712..e3ef5aa27c28 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -55186,7 +54132,7 @@ index 703c22a59092..e3ef5aa27c28 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55343,7 +54289,6 @@ index 703c22a59092..e3ef5aa27c28 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -55353,10 +54298,6 @@ index 703c22a59092..e3ef5aa27c28 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -55384,7 +54325,7 @@ index 703c22a59092..e3ef5aa27c28 100644
Library("probe_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index 291502c95a37..d0ba53b314f1 100644
+index 6e1d0acff555..d0ba53b314f1 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -55409,7 +54350,7 @@ index 291502c95a37..d0ba53b314f1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55566,7 +54507,6 @@ index 291502c95a37..d0ba53b314f1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -55576,10 +54516,6 @@ index 291502c95a37..d0ba53b314f1 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -55607,7 +54543,7 @@ index 291502c95a37..d0ba53b314f1 100644
Library("pushback_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index d83d51f98500..c2c328ca1180 100644
+index 08cfdec69bc0..c2c328ca1180 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -55632,7 +54568,7 @@ index d83d51f98500..c2c328ca1180 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55793,7 +54729,6 @@ index d83d51f98500..c2c328ca1180 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -55803,10 +54738,6 @@ index d83d51f98500..c2c328ca1180 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -55834,7 +54765,7 @@ index d83d51f98500..c2c328ca1180 100644
Library("send_side_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index 7e8cb8782020..bb0f0dcf3f16 100644
+index 62800e263d1a..bb0f0dcf3f16 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -55859,7 +54790,7 @@ index 7e8cb8782020..bb0f0dcf3f16 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56021,7 +54952,6 @@ index 7e8cb8782020..bb0f0dcf3f16 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -56031,10 +54961,6 @@ index 7e8cb8782020..bb0f0dcf3f16 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -56062,7 +54988,7 @@ index 7e8cb8782020..bb0f0dcf3f16 100644
Library("control_handler_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index 40ead5619cde..341ba2492f8d 100644
+index 41f64326b268..341ba2492f8d 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -56087,7 +55013,7 @@ index 40ead5619cde..341ba2492f8d 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56248,7 +55174,6 @@ index 40ead5619cde..341ba2492f8d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -56258,10 +55183,6 @@ index 40ead5619cde..341ba2492f8d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57348,7 +56269,7 @@ index 3a663949bb31..515a6b7fe6df 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index d61cca4a488c..021306b00c2a 100644
+index 7613736af280..021306b00c2a 100644
--- third_party/libwebrtc/modules/module_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57482,7 +56403,7 @@ index d61cca4a488c..021306b00c2a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57514,16 +56435,9 @@ index d61cca4a488c..021306b00c2a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57542,7 +56456,7 @@ index d61cca4a488c..021306b00c2a 100644
-
Library("module_api_gn")
diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 45518d1a8a19..03a6663f2ee5 100644
+index c40e3cf5e935..03a6663f2ee5 100644
--- third_party/libwebrtc/modules/module_api_public_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57676,7 +56590,7 @@ index 45518d1a8a19..03a6663f2ee5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57708,16 +56622,9 @@ index 45518d1a8a19..03a6663f2ee5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57736,7 +56643,7 @@ index 45518d1a8a19..03a6663f2ee5 100644
-
Library("module_api_public_gn")
diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index 7b4274f1b8a5..8f331e2b7df5 100644
+index 86a280e5ccc9..8f331e2b7df5 100644
--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57870,7 +56777,7 @@ index 7b4274f1b8a5..8f331e2b7df5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -57902,16 +56809,9 @@ index 7b4274f1b8a5..8f331e2b7df5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -57930,7 +56830,7 @@ index 7b4274f1b8a5..8f331e2b7df5 100644
-
Library("module_fec_api_gn")
diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index a528123ae068..e46741806ee3 100644
+index 8bb44ecf6256..e46741806ee3 100644
--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57955,7 +56855,7 @@ index a528123ae068..e46741806ee3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58105,7 +57005,6 @@ index a528123ae068..e46741806ee3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -58115,10 +57014,6 @@ index a528123ae068..e46741806ee3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58146,7 +57041,7 @@ index a528123ae068..e46741806ee3 100644
Library("interval_budget_gn")
diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index 6b7f69865fd1..453c5e0ead44 100644
+index 353f876c55bc..453c5e0ead44 100644
--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58171,7 +57066,7 @@ index 6b7f69865fd1..453c5e0ead44 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,195 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,190 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58333,7 +57228,6 @@ index 6b7f69865fd1..453c5e0ead44 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -58343,10 +57237,6 @@ index 6b7f69865fd1..453c5e0ead44 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58428,7 +57318,7 @@ index 2760d7e5e125..309f14a69dc0 100644
DEFINES["USE_X11"] = "1"
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 2876755e9119..54de56dcae4e 100644
+index 45104d15ca46..54de56dcae4e 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -58453,7 +57343,7 @@ index 2876755e9119..54de56dcae4e 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,194 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,189 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58614,7 +57504,6 @@ index 2876755e9119..54de56dcae4e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -58624,10 +57513,6 @@ index 2876755e9119..54de56dcae4e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58655,7 +57540,7 @@ index 2876755e9119..54de56dcae4e 100644
Library("remote_bitrate_estimator_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index 88f2cb22e03b..8a8bd3e82b3a 100644
+index e42ea18507b3..8a8bd3e82b3a 100644
--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58680,7 +57565,7 @@ index 88f2cb22e03b..8a8bd3e82b3a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58826,7 +57711,6 @@ index 88f2cb22e03b..8a8bd3e82b3a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -58836,10 +57720,6 @@ index 88f2cb22e03b..8a8bd3e82b3a 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -58867,7 +57747,7 @@ index 88f2cb22e03b..8a8bd3e82b3a 100644
Library("leb128_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index da304ae5a4f9..6a99f50c5c90 100644
+index 33d8799fb2bd..6a99f50c5c90 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58892,7 +57772,7 @@ index da304ae5a4f9..6a99f50c5c90 100644
FINAL_LIBRARY = "webrtc"
-@@ -85,194 +95,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -85,189 +95,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59053,7 +57933,6 @@ index da304ae5a4f9..6a99f50c5c90 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -59063,10 +57942,6 @@ index da304ae5a4f9..6a99f50c5c90 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59094,7 +57969,7 @@ index da304ae5a4f9..6a99f50c5c90 100644
Library("rtp_rtcp_format_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index 382194837b7f..b9118e1215cd 100644
+index 8c4973643632..b9118e1215cd 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -59119,7 +57994,7 @@ index 382194837b7f..b9118e1215cd 100644
FINAL_LIBRARY = "webrtc"
-@@ -98,195 +108,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -98,190 +108,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59281,7 +58156,6 @@ index 382194837b7f..b9118e1215cd 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -59291,10 +58165,6 @@ index 382194837b7f..b9118e1215cd 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59322,7 +58192,7 @@ index 382194837b7f..b9118e1215cd 100644
Library("rtp_rtcp_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index 2c8b5e232175..172b2829c241 100644
+index d2a102cfe3a1..172b2829c241 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59347,7 +58217,7 @@ index 2c8b5e232175..172b2829c241 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59504,7 +58374,6 @@ index 2c8b5e232175..172b2829c241 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -59514,10 +58383,6 @@ index 2c8b5e232175..172b2829c241 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59545,7 +58410,7 @@ index 2c8b5e232175..172b2829c241 100644
Library("rtp_video_header_gn")
diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index d2e3ea012808..393d9c9b7322 100644
+index c260743e2819..393d9c9b7322 100644
--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59570,7 +58435,7 @@ index d2e3ea012808..393d9c9b7322 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59716,7 +58581,6 @@ index d2e3ea012808..393d9c9b7322 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -59726,10 +58590,6 @@ index d2e3ea012808..393d9c9b7322 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59757,7 +58617,7 @@ index d2e3ea012808..393d9c9b7322 100644
Library("fft_gn")
diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index aa7a21a68032..76439cf53388 100644
+index c2d2597a21a5..76439cf53388 100644
--- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59782,7 +58642,7 @@ index aa7a21a68032..76439cf53388 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59928,7 +58788,6 @@ index aa7a21a68032..76439cf53388 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -59938,10 +58797,6 @@ index aa7a21a68032..76439cf53388 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -59969,7 +58824,7 @@ index aa7a21a68032..76439cf53388 100644
Library("g711_3p_gn")
diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 41a8c05baecd..169ba1ccf906 100644
+index 468cc88c65a5..169ba1ccf906 100644
--- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59994,7 +58849,7 @@ index 41a8c05baecd..169ba1ccf906 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,179 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,174 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60140,7 +58995,6 @@ index 41a8c05baecd..169ba1ccf906 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -60150,10 +59004,6 @@ index 41a8c05baecd..169ba1ccf906 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60181,7 +59031,7 @@ index 41a8c05baecd..169ba1ccf906 100644
Library("g722_3p_gn")
diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index b6921b76262e..dda03191e506 100644
+index 6c17ac236e23..dda03191e506 100644
--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60323,7 +59173,7 @@ index b6921b76262e..dda03191e506 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -157,65 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -157,60 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60359,7 +59209,6 @@ index b6921b76262e..dda03191e506 100644
- ]
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -60369,10 +59218,6 @@ index b6921b76262e..dda03191e506 100644
- "-msse2"
- ]
-
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60391,7 +59236,7 @@ index b6921b76262e..dda03191e506 100644
-
Library("utility_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index 24988a1ffc06..a2ba3c8ac944 100644
+index f58aa8e782f0..a2ba3c8ac944 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
@@ -14,11 +14,21 @@ AllowCompilerWarnings()
@@ -60582,7 +59427,7 @@ index 24988a1ffc06..a2ba3c8ac944 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -210,81 +84,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -210,76 +84,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -60643,7 +59488,6 @@ index 24988a1ffc06..a2ba3c8ac944 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -60653,10 +59497,6 @@ index 24988a1ffc06..a2ba3c8ac944 100644
- "-msse2"
- ]
-
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+if CONFIG["TARGET_CPU"] == "mips32":
@@ -60667,7 +59507,7 @@ index 24988a1ffc06..a2ba3c8ac944 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -303,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -298,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -60679,7 +59519,7 @@ index 24988a1ffc06..a2ba3c8ac944 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -325,14 +128,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+@@ -320,14 +128,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -60696,7 +59536,7 @@ index 24988a1ffc06..a2ba3c8ac944 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -351,10 +154,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -346,10 +154,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -60709,7 +59549,7 @@ index 24988a1ffc06..a2ba3c8ac944 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -373,4 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -368,4 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -60719,7 +59559,7 @@ index 24988a1ffc06..a2ba3c8ac944 100644
+
Library("video_capture_internal_impl_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 49c62d5cf608..30fbc8a16f91 100644
+index 820d5655dfe4..30fbc8a16f91 100644
--- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60744,7 +59584,7 @@ index 49c62d5cf608..30fbc8a16f91 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,195 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60906,7 +59746,6 @@ index 49c62d5cf608..30fbc8a16f91 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -60916,10 +59755,6 @@ index 49c62d5cf608..30fbc8a16f91 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -60947,7 +59782,7 @@ index 49c62d5cf608..30fbc8a16f91 100644
Library("video_capture_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index dd8e979e41fe..3c56145fb1aa 100644
+index 144097f87a25..3c56145fb1aa 100644
--- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60972,7 +59807,7 @@ index dd8e979e41fe..3c56145fb1aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61129,7 +59964,6 @@ index dd8e979e41fe..3c56145fb1aa 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -61139,10 +59973,6 @@ index dd8e979e41fe..3c56145fb1aa 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61170,7 +60000,7 @@ index dd8e979e41fe..3c56145fb1aa 100644
Library("chain_diff_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index 73fce5bf02bb..4c79e5b318d9 100644
+index cf74ae964c79..4c79e5b318d9 100644
--- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61308,7 +60138,7 @@ index 73fce5bf02bb..4c79e5b318d9 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -61340,16 +60170,9 @@ index 73fce5bf02bb..4c79e5b318d9 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61368,7 +60191,7 @@ index 73fce5bf02bb..4c79e5b318d9 100644
-
Library("codec_globals_headers_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index e67bb6616d49..100155a39f1f 100644
+index bfe37b935d06..100155a39f1f 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61393,7 +60216,7 @@ index e67bb6616d49..100155a39f1f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61550,7 +60373,6 @@ index e67bb6616d49..100155a39f1f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -61560,10 +60382,6 @@ index e67bb6616d49..100155a39f1f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61591,7 +60409,7 @@ index e67bb6616d49..100155a39f1f 100644
Library("av1_svc_config_gn")
diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index 9b8e33b7d542..5a661787308d 100644
+index 31e83f9c3105..5a661787308d 100644
--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61616,7 +60434,7 @@ index 9b8e33b7d542..5a661787308d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61777,7 +60595,6 @@ index 9b8e33b7d542..5a661787308d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -61787,10 +60604,6 @@ index 9b8e33b7d542..5a661787308d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -61818,7 +60631,7 @@ index 9b8e33b7d542..5a661787308d 100644
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index 487fc5b4d6e5..97d7596cd7ee 100644
+index 1ad9c574ad8a..97d7596cd7ee 100644
--- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61843,7 +60656,7 @@ index 487fc5b4d6e5..97d7596cd7ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62000,7 +60813,6 @@ index 487fc5b4d6e5..97d7596cd7ee 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -62010,10 +60822,6 @@ index 487fc5b4d6e5..97d7596cd7ee 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62041,7 +60849,7 @@ index 487fc5b4d6e5..97d7596cd7ee 100644
Library("frame_dependencies_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index dd901a5371a0..99867a1c8f90 100644
+index ccac90f50d1f..99867a1c8f90 100644
--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62066,7 +60874,7 @@ index dd901a5371a0..99867a1c8f90 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62223,7 +61031,6 @@ index dd901a5371a0..99867a1c8f90 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -62233,10 +61040,6 @@ index dd901a5371a0..99867a1c8f90 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62264,7 +61067,7 @@ index dd901a5371a0..99867a1c8f90 100644
Library("frame_helpers_gn")
diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index 0f6654f1ab6f..309d2686d921 100644
+index d50ed75a0006..309d2686d921 100644
--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62289,7 +61092,7 @@ index 0f6654f1ab6f..309d2686d921 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62450,7 +61253,6 @@ index 0f6654f1ab6f..309d2686d921 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -62460,10 +61262,6 @@ index 0f6654f1ab6f..309d2686d921 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62491,7 +61289,7 @@ index 0f6654f1ab6f..309d2686d921 100644
Library("nack_requester_gn")
diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index f3f85aacaa19..c1be9596e0a5 100644
+index 2c161989c1d3..c1be9596e0a5 100644
--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62516,7 +61314,7 @@ index f3f85aacaa19..c1be9596e0a5 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62677,7 +61475,6 @@ index f3f85aacaa19..c1be9596e0a5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -62687,10 +61484,6 @@ index f3f85aacaa19..c1be9596e0a5 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62718,7 +61511,7 @@ index f3f85aacaa19..c1be9596e0a5 100644
Library("packet_buffer_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index 8a1dfd6377d5..c4b6ec469538 100644
+index 80eb00a9910e..c4b6ec469538 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62743,7 +61536,7 @@ index 8a1dfd6377d5..c4b6ec469538 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62900,7 +61693,6 @@ index 8a1dfd6377d5..c4b6ec469538 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -62910,10 +61702,6 @@ index 8a1dfd6377d5..c4b6ec469538 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -62941,7 +61729,7 @@ index 8a1dfd6377d5..c4b6ec469538 100644
Library("scalability_mode_util_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index a3ea8b349573..bb66a11cb47c 100644
+index 931dfe8d894c..bb66a11cb47c 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62966,7 +61754,7 @@ index a3ea8b349573..bb66a11cb47c 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,190 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,185 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63123,7 +61911,6 @@ index a3ea8b349573..bb66a11cb47c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -63133,10 +61920,6 @@ index a3ea8b349573..bb66a11cb47c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -63164,7 +61947,7 @@ index a3ea8b349573..bb66a11cb47c 100644
Library("scalability_structures_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index a285154a79ed..9fad4e4a38d8 100644
+index 18aa68e6963c..9fad4e4a38d8 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63189,7 +61972,7 @@ index a285154a79ed..9fad4e4a38d8 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63339,7 +62122,6 @@ index a285154a79ed..9fad4e4a38d8 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -63349,10 +62131,6 @@ index a285154a79ed..9fad4e4a38d8 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -63380,7 +62158,7 @@ index a285154a79ed..9fad4e4a38d8 100644
Library("scalable_video_controller_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index 412f719d18cd..415872506d13 100644
+index bbb5a75959f0..415872506d13 100644
--- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63405,7 +62183,7 @@ index 412f719d18cd..415872506d13 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63562,7 +62340,6 @@ index 412f719d18cd..415872506d13 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -63572,10 +62349,6 @@ index 412f719d18cd..415872506d13 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -63603,7 +62376,7 @@ index 412f719d18cd..415872506d13 100644
Library("svc_rate_allocator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-index 36867642c7ba..81060f6b3f2c 100644
+index 2347b0937ce7..81060f6b3f2c 100644
--- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63628,7 +62401,7 @@ index 36867642c7ba..81060f6b3f2c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63778,7 +62551,6 @@ index 36867642c7ba..81060f6b3f2c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -63788,10 +62560,6 @@ index 36867642c7ba..81060f6b3f2c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -63819,7 +62587,7 @@ index 36867642c7ba..81060f6b3f2c 100644
Library("decode_time_percentile_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-index caf0efc16596..463feb1bc7a7 100644
+index 274023c6e760..463feb1bc7a7 100644
--- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63844,7 +62612,7 @@ index caf0efc16596..463feb1bc7a7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63994,7 +62762,6 @@ index caf0efc16596..463feb1bc7a7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -64004,10 +62771,6 @@ index caf0efc16596..463feb1bc7a7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64035,7 +62798,7 @@ index caf0efc16596..463feb1bc7a7 100644
Library("frame_delay_variation_kalman_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-index 8c6e826a4a85..284a46af8e7d 100644
+index d4ec330ed14a..284a46af8e7d 100644
--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64060,7 +62823,7 @@ index 8c6e826a4a85..284a46af8e7d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64210,7 +62973,6 @@ index 8c6e826a4a85..284a46af8e7d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -64220,10 +62982,6 @@ index 8c6e826a4a85..284a46af8e7d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64251,7 +63009,7 @@ index 8c6e826a4a85..284a46af8e7d 100644
Library("inter_frame_delay_variation_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-index c7ca3c7fd85f..c38cf361ccf6 100644
+index e540f00f8c72..c38cf361ccf6 100644
--- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64276,7 +63034,7 @@ index c7ca3c7fd85f..c38cf361ccf6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64437,7 +63195,6 @@ index c7ca3c7fd85f..c38cf361ccf6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -64447,10 +63204,6 @@ index c7ca3c7fd85f..c38cf361ccf6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64478,7 +63231,7 @@ index c7ca3c7fd85f..c38cf361ccf6 100644
Library("jitter_estimator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-index f3993a17b1c2..13ea6d3315e7 100644
+index 18a30a6ede64..13ea6d3315e7 100644
--- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64503,7 +63256,7 @@ index f3993a17b1c2..13ea6d3315e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64653,7 +63406,6 @@ index f3993a17b1c2..13ea6d3315e7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -64663,10 +63415,6 @@ index f3993a17b1c2..13ea6d3315e7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64694,7 +63442,7 @@ index f3993a17b1c2..13ea6d3315e7 100644
Library("rtt_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-index ad8a6874e406..59227c6d26ab 100644
+index 4c2a6eed6200..59227c6d26ab 100644
--- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64719,7 +63467,7 @@ index ad8a6874e406..59227c6d26ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64869,7 +63617,6 @@ index ad8a6874e406..59227c6d26ab 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -64879,10 +63626,6 @@ index ad8a6874e406..59227c6d26ab 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -64910,7 +63653,7 @@ index ad8a6874e406..59227c6d26ab 100644
Library("timestamp_extrapolator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-index 60cc81a2292b..40909203b3cf 100644
+index 76c4cfe66496..40909203b3cf 100644
--- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64935,7 +63678,7 @@ index 60cc81a2292b..40909203b3cf 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65096,7 +63839,6 @@ index 60cc81a2292b..40909203b3cf 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -65106,10 +63848,6 @@ index 60cc81a2292b..40909203b3cf 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65137,7 +63875,7 @@ index 60cc81a2292b..40909203b3cf 100644
Library("timing_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index b14bef2dec4f..fae7dffcca41 100644
+index 141def90908b..fae7dffcca41 100644
--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -65162,7 +63900,7 @@ index b14bef2dec4f..fae7dffcca41 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65319,7 +64057,6 @@ index b14bef2dec4f..fae7dffcca41 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -65329,10 +64066,6 @@ index b14bef2dec4f..fae7dffcca41 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65360,7 +64093,7 @@ index b14bef2dec4f..fae7dffcca41 100644
Library("video_codec_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index 5af51f1238a8..48e566809b99 100644
+index 923ac7785a18..48e566809b99 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -65385,7 +64118,7 @@ index 5af51f1238a8..48e566809b99 100644
FINAL_LIBRARY = "webrtc"
-@@ -57,195 +67,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,190 +67,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65547,7 +64280,6 @@ index 5af51f1238a8..48e566809b99 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -65557,10 +64289,6 @@ index 5af51f1238a8..48e566809b99 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65588,7 +64316,7 @@ index 5af51f1238a8..48e566809b99 100644
Library("video_coding_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index d42eb284cd9a..c914dfcbd7b5 100644
+index bc1510e0baa4..c914dfcbd7b5 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -65613,7 +64341,7 @@ index d42eb284cd9a..c914dfcbd7b5 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,195 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65775,7 +64503,6 @@ index d42eb284cd9a..c914dfcbd7b5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -65785,10 +64512,6 @@ index d42eb284cd9a..c914dfcbd7b5 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -65816,7 +64539,7 @@ index d42eb284cd9a..c914dfcbd7b5 100644
Library("video_coding_utility_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index 81c9b9d4043c..e49d55137a91 100644
+index 8cb4b64625a9..e49d55137a91 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
@@ -15,11 +15,21 @@ AllowCompilerWarnings()
@@ -65841,7 +64564,7 @@ index 81c9b9d4043c..e49d55137a91 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,178 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65991,7 +64714,6 @@ index 81c9b9d4043c..e49d55137a91 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -66001,10 +64723,6 @@ index 81c9b9d4043c..e49d55137a91 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66032,7 +64750,7 @@ index 81c9b9d4043c..e49d55137a91 100644
Library("webrtc_libvpx_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index 82a4d24e97a9..7fbbf3bb99f1 100644
+index 21d5eeee9fe0..7fbbf3bb99f1 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
@@ -15,11 +15,21 @@ AllowCompilerWarnings()
@@ -66057,7 +64775,7 @@ index 82a4d24e97a9..7fbbf3bb99f1 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,195 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66219,7 +64937,6 @@ index 82a4d24e97a9..7fbbf3bb99f1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -66229,10 +64946,6 @@ index 82a4d24e97a9..7fbbf3bb99f1 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66260,7 +64973,7 @@ index 82a4d24e97a9..7fbbf3bb99f1 100644
Library("webrtc_vp8_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 6799224dff30..b382aa7a36f5 100644
+index 92fd7cf63049..b382aa7a36f5 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66285,7 +64998,7 @@ index 6799224dff30..b382aa7a36f5 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66435,7 +65148,6 @@ index 6799224dff30..b382aa7a36f5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -66445,10 +65157,6 @@ index 6799224dff30..b382aa7a36f5 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66476,7 +65184,7 @@ index 6799224dff30..b382aa7a36f5 100644
Library("webrtc_vp8_scalability_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index 2423950ba511..9886a43a6d6c 100644
+index caf91a5d2cba..9886a43a6d6c 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66501,7 +65209,7 @@ index 2423950ba511..9886a43a6d6c 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,195 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66663,7 +65371,6 @@ index 2423950ba511..9886a43a6d6c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -66673,10 +65380,6 @@ index 2423950ba511..9886a43a6d6c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66704,7 +65407,7 @@ index 2423950ba511..9886a43a6d6c 100644
Library("webrtc_vp8_temporal_layers_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index 5bb64f341208..0eba1201fe1f 100644
+index 707d56355909..0eba1201fe1f 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
@@ -15,11 +15,21 @@ AllowCompilerWarnings()
@@ -66729,7 +65432,7 @@ index 5bb64f341208..0eba1201fe1f 100644
FINAL_LIBRARY = "webrtc"
-@@ -51,195 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66891,7 +65594,6 @@ index 5bb64f341208..0eba1201fe1f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -66901,10 +65603,6 @@ index 5bb64f341208..0eba1201fe1f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -66932,7 +65630,7 @@ index 5bb64f341208..0eba1201fe1f 100644
Library("webrtc_vp9_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index 6f1575870ead..caec155ca861 100644
+index 883e5c70b24b..caec155ca861 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66957,7 +65655,7 @@ index 6f1575870ead..caec155ca861 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,195 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67119,7 +65817,6 @@ index 6f1575870ead..caec155ca861 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -67129,10 +65826,6 @@ index 6f1575870ead..caec155ca861 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -67160,10 +65853,10 @@ index 6f1575870ead..caec155ca861 100644
Library("webrtc_vp9_helpers_gn")
diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index ae994ffc670b..4b745f5029e2 100644
+index ad1adce75739..55860774ec2c 100644
--- third_party/libwebrtc/moz.build
+++ third_party/libwebrtc/moz.build
-@@ -263,6 +263,8 @@ DIRS += [
+@@ -265,6 +265,8 @@ DIRS += [
"/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
"/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
"/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
@@ -67172,7 +65865,7 @@ index ae994ffc670b..4b745f5029e2 100644
"/third_party/libwebrtc/modules/module_api_gn",
"/third_party/libwebrtc/modules/module_api_public_gn",
"/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -463,102 +465,11 @@ DIRS += [
+@@ -464,102 +466,11 @@ DIRS += [
"/third_party/libwebrtc/webrtc_gn"
]
@@ -67276,7 +65969,7 @@ index ae994ffc670b..4b745f5029e2 100644
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -566,26 +477,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -567,26 +478,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
]
@@ -67304,7 +65997,7 @@ index ae994ffc670b..4b745f5029e2 100644
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -593,11 +487,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
+@@ -594,11 +488,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
]
@@ -67317,7 +66010,7 @@ index ae994ffc670b..4b745f5029e2 100644
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -605,7 +497,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
+@@ -606,7 +498,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
]
@@ -67326,7 +66019,7 @@ index ae994ffc670b..4b745f5029e2 100644
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -613,8 +505,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -614,8 +506,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -67335,7 +66028,7 @@ index ae994ffc670b..4b745f5029e2 100644
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -622,7 +512,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -623,7 +513,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
]
@@ -67344,7 +66037,7 @@ index ae994ffc670b..4b745f5029e2 100644
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -630,69 +520,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -631,69 +521,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -67415,7 +66108,7 @@ index ae994ffc670b..4b745f5029e2 100644
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
- ]
diff --git third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-index 866c7aec5add..334fc3e241bd 100644
+index c278a28f8f41..334fc3e241bd 100644
--- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67440,7 +66133,7 @@ index 866c7aec5add..334fc3e241bd 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67598,7 +66291,6 @@ index 866c7aec5add..334fc3e241bd 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -67608,10 +66300,6 @@ index 866c7aec5add..334fc3e241bd 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -67639,7 +66327,7 @@ index 866c7aec5add..334fc3e241bd 100644
Library("async_dns_resolver_gn")
diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-index 0038aa7ef88c..e6471de4496d 100644
+index 40c8366f9771..e6471de4496d 100644
--- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67773,7 +66461,7 @@ index 0038aa7ef88c..e6471de4496d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -67805,16 +66493,9 @@ index 0038aa7ef88c..e6471de4496d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -67832,232 +66513,8 @@ index 0038aa7ef88c..e6471de4496d 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("async_packet_socket_gn")
-diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-index 485ef7ae1c5d..141483e9b8ee 100644
---- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
-+DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
-
- FINAL_LIBRARY = "webrtc"
-
-@@ -43,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-- DEFINES["HAVE_SYS_UIO_H"] = True
-- DEFINES["WEBRTC_ANDROID"] = True
-- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_GNU_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
-- DEFINES["WEBRTC_MAC"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_NSS_CERTS"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
-- DEFINES["USE_GLIB"] = "1"
-- DEFINES["USE_OZONE"] = "1"
-- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_BSD"] = True
-- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_LARGEFILE64_SOURCE"] = True
-- DEFINES["_LARGEFILE_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
-- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-- DEFINES["NOMINMAX"] = True
-- DEFINES["NTDDI_VERSION"] = "0x0A000000"
-- DEFINES["PSAPI_VERSION"] = "2"
-- DEFINES["RTC_ENABLE_WIN_WGC"] = True
-- DEFINES["UNICODE"] = True
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_WIN"] = True
-- DEFINES["WIN32"] = True
-- DEFINES["WIN32_LEAN_AND_MEAN"] = True
-- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
-- DEFINES["WINVER"] = "0x0A00"
-- DEFINES["_ATL_NO_OPENGL"] = True
-- DEFINES["_CRT_RAND_S"] = True
-- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-- DEFINES["_HAS_EXCEPTIONS"] = "0"
-- DEFINES["_HAS_NODISCARD"] = True
-- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-- DEFINES["_SECURE_ATL"] = True
-- DEFINES["_UNICODE"] = True
-- DEFINES["_WIN32_WINNT"] = "0x0A00"
-- DEFINES["_WINDOWS"] = True
-- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
-- ]
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
-- DEFINES["_GNU_SOURCE"] = True
-
- if CONFIG["TARGET_CPU"] == "x86":
-
-- 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
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
-- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
--
-- OS_LIBS += [
-- "android_support",
-- "unwind"
-- ]
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
- CXXFLAGS += [
- "-msse2"
- ]
-
-- OS_LIBS += [
-- "android_support"
-- ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
-+if CONFIG["TARGET_CPU"] == "x86_64":
-
-- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
-- DEFINES["_GNU_SOURCE"] = True
-+ DEFINES["USE_X11"] = "1"
-
- Library("async_resolver_interface_gn")
diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-index 62b75c06ce21..6a1b5eae3ba5 100644
+index c756a0eb110c..6a1b5eae3ba5 100644
--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68082,7 +66539,7 @@ index 62b75c06ce21..6a1b5eae3ba5 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68239,7 +66696,6 @@ index 62b75c06ce21..6a1b5eae3ba5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -68249,10 +66705,6 @@ index 62b75c06ce21..6a1b5eae3ba5 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68280,7 +66732,7 @@ index 62b75c06ce21..6a1b5eae3ba5 100644
Library("audio_format_to_string_gn")
diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index a4a4e8c6e42a..94d68859a601 100644
+index ca5959866c1c..94d68859a601 100644
--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68305,7 +66757,7 @@ index a4a4e8c6e42a..94d68859a601 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68455,7 +66907,6 @@ index a4a4e8c6e42a..94d68859a601 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -68465,10 +66916,6 @@ index a4a4e8c6e42a..94d68859a601 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68496,7 +66943,7 @@ index a4a4e8c6e42a..94d68859a601 100644
Library("bit_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-index 8836b1e08940..0456682b1478 100644
+index 8c00ef1ac51a..0456682b1478 100644
--- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68521,7 +66968,7 @@ index 8836b1e08940..0456682b1478 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68678,7 +67125,6 @@ index 8836b1e08940..0456682b1478 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -68688,10 +67134,6 @@ index 8836b1e08940..0456682b1478 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68719,7 +67161,7 @@ index 8836b1e08940..0456682b1478 100644
Library("bitrate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index b6a5de1971d5..63a6ddbeeec1 100644
+index 2047e015e4d7..63a6ddbeeec1 100644
--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68744,7 +67186,7 @@ index b6a5de1971d5..63a6ddbeeec1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68894,7 +67336,6 @@ index b6a5de1971d5..63a6ddbeeec1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -68904,10 +67345,6 @@ index b6a5de1971d5..63a6ddbeeec1 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -68935,7 +67372,7 @@ index b6a5de1971d5..63a6ddbeeec1 100644
Library("bitstream_reader_gn")
diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index cb5a45ce58bb..2a2b6adff2b4 100644
+index acbe827a94aa..2a2b6adff2b4 100644
--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69073,7 +67510,7 @@ index cb5a45ce58bb..2a2b6adff2b4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69105,16 +67542,9 @@ index cb5a45ce58bb..2a2b6adff2b4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69133,7 +67563,7 @@ index cb5a45ce58bb..2a2b6adff2b4 100644
-
Library("buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index b093b72f1f14..3105ccac7dc2 100644
+index 4d9cc19bfba6..3105ccac7dc2 100644
--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69158,7 +67588,7 @@ index b093b72f1f14..3105ccac7dc2 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69308,7 +67738,6 @@ index b093b72f1f14..3105ccac7dc2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -69318,10 +67747,6 @@ index b093b72f1f14..3105ccac7dc2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69349,7 +67774,7 @@ index b093b72f1f14..3105ccac7dc2 100644
Library("byte_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index 21ea639dd4c3..485929410a19 100644
+index 621abaa96d62..485929410a19 100644
--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69483,7 +67908,7 @@ index 21ea639dd4c3..485929410a19 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69515,16 +67940,9 @@ index 21ea639dd4c3..485929410a19 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69543,7 +67961,7 @@ index 21ea639dd4c3..485929410a19 100644
-
Library("byte_order_gn")
diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index f2ef2e2a78ef..7b90d3cec001 100644
+index ee982603d3c5..7b90d3cec001 100644
--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69568,7 +67986,7 @@ index f2ef2e2a78ef..7b90d3cec001 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69718,7 +68136,6 @@ index f2ef2e2a78ef..7b90d3cec001 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -69728,10 +68145,6 @@ index f2ef2e2a78ef..7b90d3cec001 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69759,7 +68172,7 @@ index f2ef2e2a78ef..7b90d3cec001 100644
Library("checks_gn")
diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 9f6999032d53..537becb3aa19 100644
+index 62b89c7deb5f..537becb3aa19 100644
--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69893,7 +68306,7 @@ index 9f6999032d53..537becb3aa19 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69925,16 +68338,9 @@ index 9f6999032d53..537becb3aa19 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -69953,7 +68359,7 @@ index 9f6999032d53..537becb3aa19 100644
-
Library("compile_assert_c_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index 8fd59a6ce285..f8a255e5bd46 100644
+index ff33c5381a42..f8a255e5bd46 100644
--- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69978,7 +68384,7 @@ index 8fd59a6ce285..f8a255e5bd46 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70128,7 +68534,6 @@ index 8fd59a6ce285..f8a255e5bd46 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -70138,10 +68543,6 @@ index 8fd59a6ce285..f8a255e5bd46 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70169,7 +68570,7 @@ index 8fd59a6ce285..f8a255e5bd46 100644
Library("flat_containers_internal_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index 164aae296917..3a040d68f592 100644
+index 9b6add6b867b..3a040d68f592 100644
--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70307,7 +68708,7 @@ index 164aae296917..3a040d68f592 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -70339,16 +68740,9 @@ index 164aae296917..3a040d68f592 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70367,7 +68761,7 @@ index 164aae296917..3a040d68f592 100644
-
Library("flat_map_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index 5283c7e3d3be..6f4cccc313e8 100644
+index 4b398de383c4..6f4cccc313e8 100644
--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70505,7 +68899,7 @@ index 5283c7e3d3be..6f4cccc313e8 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -70537,16 +68931,9 @@ index 5283c7e3d3be..6f4cccc313e8 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70565,7 +68952,7 @@ index 5283c7e3d3be..6f4cccc313e8 100644
-
Library("flat_set_gn")
diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index f026e25abd0b..89d6eded82d3 100644
+index cb8e9c4a5fc1..89d6eded82d3 100644
--- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70590,7 +68977,7 @@ index f026e25abd0b..89d6eded82d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70740,7 +69127,6 @@ index f026e25abd0b..89d6eded82d3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -70750,10 +69136,6 @@ index f026e25abd0b..89d6eded82d3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70781,7 +69163,7 @@ index f026e25abd0b..89d6eded82d3 100644
Library("copy_on_write_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index 4aa1aa43535a..339e21e75364 100644
+index a681a1274629..339e21e75364 100644
--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70806,7 +69188,7 @@ index 4aa1aa43535a..339e21e75364 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70956,7 +69338,6 @@ index 4aa1aa43535a..339e21e75364 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -70966,10 +69347,6 @@ index 4aa1aa43535a..339e21e75364 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70997,7 +69374,7 @@ index 4aa1aa43535a..339e21e75364 100644
Library("criticalsection_gn")
diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index 79146161c229..48add74427c6 100644
+index f30da236c460..48add74427c6 100644
--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71135,7 +69512,7 @@ index 79146161c229..48add74427c6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -71167,16 +69544,9 @@ index 79146161c229..48add74427c6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71195,7 +69565,7 @@ index 79146161c229..48add74427c6 100644
-
Library("divide_round_gn")
diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-index 7bfe2d0c75c0..fdba8802853b 100644
+index 5f1d97d2e8b4..fdba8802853b 100644
--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
+++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71329,7 +69699,7 @@ index 7bfe2d0c75c0..fdba8802853b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -71361,16 +69731,9 @@ index 7bfe2d0c75c0..fdba8802853b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71389,7 +69752,7 @@ index 7bfe2d0c75c0..fdba8802853b 100644
-
Library("dscp_gn")
diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index 06daf6b03a02..f402ae850f31 100644
+index 9ff988a2515c..f402ae850f31 100644
--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71414,7 +69777,7 @@ index 06daf6b03a02..f402ae850f31 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71571,7 +69934,6 @@ index 06daf6b03a02..f402ae850f31 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -71581,10 +69943,6 @@ index 06daf6b03a02..f402ae850f31 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71612,7 +69970,7 @@ index 06daf6b03a02..f402ae850f31 100644
Library("event_tracer_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 4435f010b6bd..9cc536965c58 100644
+index 1857d67850d0..9cc536965c58 100644
--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71637,7 +69995,7 @@ index 4435f010b6bd..9cc536965c58 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71794,7 +70152,6 @@ index 4435f010b6bd..9cc536965c58 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -71804,10 +70161,6 @@ index 4435f010b6bd..9cc536965c58 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -71835,7 +70188,7 @@ index 4435f010b6bd..9cc536965c58 100644
Library("alr_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index cbbb32ab7072..15521be543f6 100644
+index 3a258e46965a..15521be543f6 100644
--- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71860,7 +70213,7 @@ index cbbb32ab7072..15521be543f6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72017,7 +70370,6 @@ index cbbb32ab7072..15521be543f6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -72027,10 +70379,6 @@ index cbbb32ab7072..15521be543f6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72058,7 +70406,7 @@ index cbbb32ab7072..15521be543f6 100644
Library("balanced_degradation_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
-index 95a92d20e182..eedfd17761b3 100644
+index b8a6ccdd291d..eedfd17761b3 100644
--- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72083,7 +70431,7 @@ index 95a92d20e182..eedfd17761b3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72240,7 +70588,6 @@ index 95a92d20e182..eedfd17761b3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -72250,10 +70597,6 @@ index 95a92d20e182..eedfd17761b3 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72281,7 +70624,7 @@ index 95a92d20e182..eedfd17761b3 100644
Library("bandwidth_quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-index 5151c986c4b8..17833ef180df 100644
+index b436f5962dea..17833ef180df 100644
--- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72306,7 +70649,7 @@ index 5151c986c4b8..17833ef180df 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72463,7 +70806,6 @@ index 5151c986c4b8..17833ef180df 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -72473,10 +70815,6 @@ index 5151c986c4b8..17833ef180df 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72504,7 +70842,7 @@ index 5151c986c4b8..17833ef180df 100644
Library("cpu_speed_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index b7a699fe03d0..5b8291b5a0f8 100644
+index ad4be851e07d..5b8291b5a0f8 100644
--- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72529,7 +70867,7 @@ index b7a699fe03d0..5b8291b5a0f8 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72686,7 +71024,6 @@ index b7a699fe03d0..5b8291b5a0f8 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -72696,10 +71033,6 @@ index b7a699fe03d0..5b8291b5a0f8 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72727,7 +71060,7 @@ index b7a699fe03d0..5b8291b5a0f8 100644
Library("encoder_info_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index ea63aafc99e4..6f561f98057c 100644
+index 31a945e00fd8..6f561f98057c 100644
--- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72752,7 +71085,7 @@ index ea63aafc99e4..6f561f98057c 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72909,7 +71242,6 @@ index ea63aafc99e4..6f561f98057c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -72919,10 +71251,6 @@ index ea63aafc99e4..6f561f98057c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -72950,7 +71278,7 @@ index ea63aafc99e4..6f561f98057c 100644
Library("field_trial_parser_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 3857bc9451e5..e4dbcc26dabc 100644
+index 3b5cbf462f8e..e4dbcc26dabc 100644
--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72975,7 +71303,7 @@ index 3857bc9451e5..e4dbcc26dabc 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73132,7 +71460,6 @@ index 3857bc9451e5..e4dbcc26dabc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -73142,10 +71469,6 @@ index 3857bc9451e5..e4dbcc26dabc 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73173,7 +71496,7 @@ index 3857bc9451e5..e4dbcc26dabc 100644
Library("keyframe_interval_settings_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index 5f811a6c6da4..0354b3c70d5e 100644
+index e2c4f2537ee2..0354b3c70d5e 100644
--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73198,7 +71521,7 @@ index 5f811a6c6da4..0354b3c70d5e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73355,7 +71678,6 @@ index 5f811a6c6da4..0354b3c70d5e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -73365,10 +71687,6 @@ index 5f811a6c6da4..0354b3c70d5e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73396,7 +71714,7 @@ index 5f811a6c6da4..0354b3c70d5e 100644
Library("min_video_bitrate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-index 68ad8a0f1413..a6c29e1fb3af 100644
+index 2cdcea589746..a6c29e1fb3af 100644
--- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73421,7 +71739,7 @@ index 68ad8a0f1413..a6c29e1fb3af 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73578,7 +71896,6 @@ index 68ad8a0f1413..a6c29e1fb3af 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -73588,10 +71905,6 @@ index 68ad8a0f1413..a6c29e1fb3af 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73619,7 +71932,7 @@ index 68ad8a0f1413..a6c29e1fb3af 100644
Library("normalize_simulcast_size_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-index c4b1f5bc22c7..222b58931e96 100644
+index 234db8e90613..222b58931e96 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73644,7 +71957,7 @@ index c4b1f5bc22c7..222b58931e96 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73801,7 +72114,6 @@ index c4b1f5bc22c7..222b58931e96 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -73811,10 +72123,6 @@ index c4b1f5bc22c7..222b58931e96 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -73842,7 +72150,7 @@ index c4b1f5bc22c7..222b58931e96 100644
Library("quality_rampup_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index 298ca9297c50..916a31d69ac4 100644
+index 8ea1b5075424..916a31d69ac4 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73867,7 +72175,7 @@ index 298ca9297c50..916a31d69ac4 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74024,7 +72332,6 @@ index 298ca9297c50..916a31d69ac4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -74034,10 +72341,6 @@ index 298ca9297c50..916a31d69ac4 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74065,7 +72368,7 @@ index 298ca9297c50..916a31d69ac4 100644
Library("quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index d606a38148ca..f2d347a7f2ec 100644
+index 36a79a734721..f2d347a7f2ec 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74090,7 +72393,7 @@ index d606a38148ca..f2d347a7f2ec 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74247,7 +72550,6 @@ index d606a38148ca..f2d347a7f2ec 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -74257,10 +72559,6 @@ index d606a38148ca..f2d347a7f2ec 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74288,7 +72586,7 @@ index d606a38148ca..f2d347a7f2ec 100644
Library("quality_scaling_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index be85251358d7..23c2a12352e5 100644
+index 416e7a35c745..23c2a12352e5 100644
--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74313,7 +72611,7 @@ index be85251358d7..23c2a12352e5 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74470,7 +72768,6 @@ index be85251358d7..23c2a12352e5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -74480,10 +72777,6 @@ index be85251358d7..23c2a12352e5 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74511,7 +72804,7 @@ index be85251358d7..23c2a12352e5 100644
Library("rate_control_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-index 7229d639e8a4..7fad9c144446 100644
+index 32fd27e4ef83..7fad9c144446 100644
--- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74536,7 +72829,7 @@ index 7229d639e8a4..7fad9c144446 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74693,7 +72986,6 @@ index 7229d639e8a4..7fad9c144446 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -74703,10 +72995,6 @@ index 7229d639e8a4..7fad9c144446 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74734,7 +73022,7 @@ index 7229d639e8a4..7fad9c144446 100644
Library("rtt_mult_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-index d031f8ace4be..837697bbafe8 100644
+index bdf9e49985ea..837697bbafe8 100644
--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74759,7 +73047,7 @@ index d031f8ace4be..837697bbafe8 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74916,7 +73204,6 @@ index d031f8ace4be..837697bbafe8 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -74926,10 +73213,6 @@ index d031f8ace4be..837697bbafe8 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -74957,7 +73240,7 @@ index d031f8ace4be..837697bbafe8 100644
Library("stable_target_rate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-index 30c52de72463..249d52d48465 100644
+index e7a94c577606..249d52d48465 100644
--- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74982,7 +73265,7 @@ index 30c52de72463..249d52d48465 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75139,7 +73422,6 @@ index 30c52de72463..249d52d48465 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -75149,10 +73431,6 @@ index 30c52de72463..249d52d48465 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75180,7 +73458,7 @@ index 30c52de72463..249d52d48465 100644
Library("frequency_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index eb8534781009..213bbd0450d5 100644
+index 54596d501f69..213bbd0450d5 100644
--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75314,7 +73592,7 @@ index eb8534781009..213bbd0450d5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75346,16 +73624,9 @@ index eb8534781009..213bbd0450d5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75374,7 +73645,7 @@ index eb8534781009..213bbd0450d5 100644
-
Library("gtest_prod_gn")
diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index ee30758d89d1..30634ecae00b 100644
+index 48d98b418be0..30634ecae00b 100644
--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75399,7 +73670,7 @@ index ee30758d89d1..30634ecae00b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75549,7 +73820,6 @@ index ee30758d89d1..30634ecae00b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -75559,10 +73829,6 @@ index ee30758d89d1..30634ecae00b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75591,10 +73857,10 @@ index ee30758d89d1..30634ecae00b 100644
Library("histogram_percentile_counter_gn")
diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
deleted file mode 100644
-index 7985a5f7feba..000000000000
+index 6697a8f93cf0..000000000000
--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
+++ /dev/null
-@@ -1,100 +0,0 @@
+@@ -1,95 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -75674,7 +73940,6 @@ index 7985a5f7feba..000000000000
- DEFINES["WEBRTC_HAS_NEON"] = True
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -75686,17 +73951,13 @@ index 7985a5f7feba..000000000000
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-Library("ifaddrs_android_gn")
diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index 15c6052f7b32..59bbc5420da2 100644
+index 502a867a4b87..59bbc5420da2 100644
--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75830,7 +74091,7 @@ index 15c6052f7b32..59bbc5420da2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75862,16 +74123,9 @@ index 15c6052f7b32..59bbc5420da2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -75890,7 +74144,7 @@ index 15c6052f7b32..59bbc5420da2 100644
-
Library("ignore_wundef_gn")
diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index a893dab3c2e5..7377b5d7b0fe 100644
+index 108fd06e5450..7377b5d7b0fe 100644
--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75915,7 +74169,7 @@ index a893dab3c2e5..7377b5d7b0fe 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76072,7 +74326,6 @@ index a893dab3c2e5..7377b5d7b0fe 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -76082,10 +74335,6 @@ index a893dab3c2e5..7377b5d7b0fe 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -76113,7 +74362,7 @@ index a893dab3c2e5..7377b5d7b0fe 100644
Library("ip_address_gn")
diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 02f74cddfac6..59bf7125a288 100644
+index 85c9773f240e..59bf7125a288 100644
--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -76139,7 +74388,7 @@ index 02f74cddfac6..59bf7125a288 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76296,7 +74545,6 @@ index 02f74cddfac6..59bf7125a288 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -76306,10 +74554,6 @@ index 02f74cddfac6..59bf7125a288 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -76337,7 +74581,7 @@ index 02f74cddfac6..59bf7125a288 100644
Library("logging_gn")
diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index b44dfa38f59e..308e7658267e 100644
+index 949d31b8704d..308e7658267e 100644
--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76471,7 +74715,7 @@ index b44dfa38f59e..308e7658267e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76503,16 +74747,9 @@ index b44dfa38f59e..308e7658267e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -76531,7 +74768,7 @@ index b44dfa38f59e..308e7658267e 100644
-
Library("macromagic_gn")
diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index f5720480dd0c..32bf460aab31 100644
+index 8709bdd95ba6..32bf460aab31 100644
--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76556,7 +74793,7 @@ index f5720480dd0c..32bf460aab31 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76706,7 +74943,6 @@ index f5720480dd0c..32bf460aab31 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -76716,10 +74952,6 @@ index f5720480dd0c..32bf460aab31 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -76747,7 +74979,7 @@ index f5720480dd0c..32bf460aab31 100644
Library("aligned_malloc_gn")
diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index 84e775fe7429..1a8d9fd19077 100644
+index 43f0844548e4..1a8d9fd19077 100644
--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76885,7 +75117,7 @@ index 84e775fe7429..1a8d9fd19077 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76917,16 +75149,9 @@ index 84e775fe7429..1a8d9fd19077 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -76945,7 +75170,7 @@ index 84e775fe7429..1a8d9fd19077 100644
-
Library("mod_ops_gn")
diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index 5cd827786ed4..4dcd35c76a6c 100644
+index 15ef767b07fc..4dcd35c76a6c 100644
--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77083,7 +75308,7 @@ index 5cd827786ed4..4dcd35c76a6c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77115,16 +75340,9 @@ index 5cd827786ed4..4dcd35c76a6c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -77143,7 +75361,7 @@ index 5cd827786ed4..4dcd35c76a6c 100644
-
Library("moving_max_counter_gn")
diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index c036110d1a92..f9f2ab464a09 100644
+index ceb2150c06ce..f9f2ab464a09 100644
--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77168,7 +75386,7 @@ index c036110d1a92..f9f2ab464a09 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77325,7 +75543,6 @@ index c036110d1a92..f9f2ab464a09 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -77335,10 +75552,6 @@ index c036110d1a92..f9f2ab464a09 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -77366,7 +75579,7 @@ index c036110d1a92..f9f2ab464a09 100644
Library("net_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index a1276d9a7a78..e33a367c88f7 100644
+index fb580667ce33..e33a367c88f7 100644
--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77391,7 +75604,7 @@ index a1276d9a7a78..e33a367c88f7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77537,7 +75750,6 @@ index a1276d9a7a78..e33a367c88f7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -77547,10 +75759,6 @@ index a1276d9a7a78..e33a367c88f7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -77578,7 +75786,7 @@ index a1276d9a7a78..e33a367c88f7 100644
Library("sent_packet_gn")
diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index 083e18ac8eb2..2728e4fc1e0e 100644
+index 40a117b476ba..2728e4fc1e0e 100644
--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77603,7 +75811,7 @@ index 083e18ac8eb2..2728e4fc1e0e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77753,7 +75961,6 @@ index 083e18ac8eb2..2728e4fc1e0e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -77763,10 +75970,6 @@ index 083e18ac8eb2..2728e4fc1e0e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -77794,7 +75997,7 @@ index 083e18ac8eb2..2728e4fc1e0e 100644
Library("network_constants_gn")
diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-index c35c498d443d..907f5af871eb 100644
+index b14b2b563382..907f5af871eb 100644
--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77819,7 +76022,7 @@ index c35c498d443d..907f5af871eb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77969,7 +76172,6 @@ index c35c498d443d..907f5af871eb 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -77979,10 +76181,6 @@ index c35c498d443d..907f5af871eb 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78010,7 +76208,7 @@ index c35c498d443d..907f5af871eb 100644
Library("network_route_gn")
diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index 7385764373a0..22553cd1b0bf 100644
+index e6b3d3c59a32..22553cd1b0bf 100644
--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78035,7 +76233,7 @@ index 7385764373a0..22553cd1b0bf 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78193,7 +76391,6 @@ index 7385764373a0..22553cd1b0bf 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -78203,10 +76400,6 @@ index 7385764373a0..22553cd1b0bf 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78234,7 +76427,7 @@ index 7385764373a0..22553cd1b0bf 100644
Library("null_socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index d5afd56fb614..0e0257215437 100644
+index 10ad1f454ad8..0e0257215437 100644
--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78372,7 +76565,7 @@ index d5afd56fb614..0e0257215437 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -78404,16 +76597,9 @@ index d5afd56fb614..0e0257215437 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78432,7 +76618,7 @@ index d5afd56fb614..0e0257215437 100644
-
Library("one_time_event_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index 6e962e328066..83c2d573d1d9 100644
+index 8045b2de62ce..83c2d573d1d9 100644
--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78457,7 +76643,7 @@ index 6e962e328066..83c2d573d1d9 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78614,7 +76800,6 @@ index 6e962e328066..83c2d573d1d9 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -78624,10 +76809,6 @@ index 6e962e328066..83c2d573d1d9 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78655,7 +76836,7 @@ index 6e962e328066..83c2d573d1d9 100644
Library("platform_thread_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 0e817e6eb986..9059a39f8aac 100644
+index 3738ea61fc1d..9059a39f8aac 100644
--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78680,7 +76861,7 @@ index 0e817e6eb986..9059a39f8aac 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78830,7 +77011,6 @@ index 0e817e6eb986..9059a39f8aac 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -78840,10 +77020,6 @@ index 0e817e6eb986..9059a39f8aac 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -78871,7 +77047,7 @@ index 0e817e6eb986..9059a39f8aac 100644
Library("platform_thread_types_gn")
diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 7f1e533b39c4..4abe79939615 100644
+index 4ec9f790604a..4abe79939615 100644
--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79005,7 +77181,7 @@ index 7f1e533b39c4..4abe79939615 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79037,16 +77213,9 @@ index 7f1e533b39c4..4abe79939615 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79065,7 +77234,7 @@ index 7f1e533b39c4..4abe79939615 100644
-
Library("protobuf_utils_gn")
diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index 2fab6231568d..bdd70e6e3d8b 100644
+index ed66936a90a5..bdd70e6e3d8b 100644
--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79090,7 +77259,7 @@ index 2fab6231568d..bdd70e6e3d8b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79240,7 +77409,6 @@ index 2fab6231568d..bdd70e6e3d8b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -79250,10 +77418,6 @@ index 2fab6231568d..bdd70e6e3d8b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79281,7 +77445,7 @@ index 2fab6231568d..bdd70e6e3d8b 100644
Library("race_checker_gn")
diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index 394eefde596a..c0bea1606f76 100644
+index 93b07582aa6a..c0bea1606f76 100644
--- third_party/libwebrtc/rtc_base/random_gn/moz.build
+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79306,7 +77470,7 @@ index 394eefde596a..c0bea1606f76 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79456,7 +77620,6 @@ index 394eefde596a..c0bea1606f76 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -79466,10 +77629,6 @@ index 394eefde596a..c0bea1606f76 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79497,7 +77656,7 @@ index 394eefde596a..c0bea1606f76 100644
Library("random_gn")
diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index cf10767d72d0..3b3fba53974d 100644
+index 60acfb017625..3b3fba53974d 100644
--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79522,7 +77681,7 @@ index cf10767d72d0..3b3fba53974d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79683,7 +77842,6 @@ index cf10767d72d0..3b3fba53974d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -79693,10 +77851,6 @@ index cf10767d72d0..3b3fba53974d 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79724,7 +77878,7 @@ index cf10767d72d0..3b3fba53974d 100644
Library("rate_limiter_gn")
diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index 657f0a65979a..62e2c13f1f01 100644
+index 84b47cf914e3..62e2c13f1f01 100644
--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79749,7 +77903,7 @@ index 657f0a65979a..62e2c13f1f01 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79906,7 +78060,6 @@ index 657f0a65979a..62e2c13f1f01 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -79916,10 +78069,6 @@ index 657f0a65979a..62e2c13f1f01 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -79947,7 +78096,7 @@ index 657f0a65979a..62e2c13f1f01 100644
Library("rate_statistics_gn")
diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index f8ebf228f169..6396cbeff915 100644
+index 880d7d6236aa..6396cbeff915 100644
--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79972,7 +78121,7 @@ index f8ebf228f169..6396cbeff915 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80129,7 +78278,6 @@ index f8ebf228f169..6396cbeff915 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -80139,10 +78287,6 @@ index f8ebf228f169..6396cbeff915 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -80170,7 +78314,7 @@ index f8ebf228f169..6396cbeff915 100644
Library("rate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index a1b2bcfeccf2..53c96cdbae3a 100644
+index 383d69e4583e..53c96cdbae3a 100644
--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80304,7 +78448,7 @@ index a1b2bcfeccf2..53c96cdbae3a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80336,16 +78480,9 @@ index a1b2bcfeccf2..53c96cdbae3a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -80364,7 +78501,7 @@ index a1b2bcfeccf2..53c96cdbae3a 100644
-
Library("refcount_gn")
diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-index c5cbc0cb54b5..ecb221864f89 100644
+index 97fafd6dfbf6..ecb221864f89 100644
--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80502,7 +78639,7 @@ index c5cbc0cb54b5..ecb221864f89 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80534,16 +78671,9 @@ index c5cbc0cb54b5..ecb221864f89 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -80562,7 +78692,7 @@ index c5cbc0cb54b5..ecb221864f89 100644
-
Library("rolling_accumulator_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index a3bb657070e1..48c882b1fbad 100644
+index d120effc6944..48c882b1fbad 100644
--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80587,7 +78717,7 @@ index a3bb657070e1..48c882b1fbad 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80744,7 +78874,6 @@ index a3bb657070e1..48c882b1fbad 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -80754,10 +78883,6 @@ index a3bb657070e1..48c882b1fbad 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -80785,7 +78910,7 @@ index a3bb657070e1..48c882b1fbad 100644
Library("rtc_event_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index 1c0d84013b28..5c7773f371b8 100644
+index ac5a402772b4..5c7773f371b8 100644
--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80810,7 +78935,7 @@ index 1c0d84013b28..5c7773f371b8 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,178 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80960,7 +79085,6 @@ index 1c0d84013b28..5c7773f371b8 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -80970,10 +79094,6 @@ index 1c0d84013b28..5c7773f371b8 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81001,7 +79121,7 @@ index 1c0d84013b28..5c7773f371b8 100644
Library("rtc_numerics_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-index 21635e570bc3..a0e7ee73dc4b 100644
+index a8de45e8df8c..a0e7ee73dc4b 100644
--- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81026,7 +79146,7 @@ index 21635e570bc3..a0e7ee73dc4b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81176,7 +79296,6 @@ index 21635e570bc3..a0e7ee73dc4b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -81186,10 +79305,6 @@ index 21635e570bc3..a0e7ee73dc4b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81217,7 +79332,7 @@ index 21635e570bc3..a0e7ee73dc4b 100644
Library("rtc_task_queue_gn")
diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index fdcf248573b0..1e96f7ad161b 100644
+index 77dbd737c811..1e96f7ad161b 100644
--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81351,7 +79466,7 @@ index fdcf248573b0..1e96f7ad161b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81383,16 +79498,9 @@ index fdcf248573b0..1e96f7ad161b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81411,7 +79519,7 @@ index fdcf248573b0..1e96f7ad161b 100644
-
Library("safe_compare_gn")
diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index 5901f174a670..481f97d18267 100644
+index f0d60f392270..481f97d18267 100644
--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81549,7 +79657,7 @@ index 5901f174a670..481f97d18267 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81581,16 +79689,9 @@ index 5901f174a670..481f97d18267 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81609,7 +79710,7 @@ index 5901f174a670..481f97d18267 100644
-
Library("safe_conversions_gn")
diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index c01e7c799bcf..444ff334be9f 100644
+index a975f0911fe9..444ff334be9f 100644
--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81747,7 +79848,7 @@ index c01e7c799bcf..444ff334be9f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81779,16 +79880,9 @@ index c01e7c799bcf..444ff334be9f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -81807,7 +79901,7 @@ index c01e7c799bcf..444ff334be9f 100644
-
Library("safe_minmax_gn")
diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-index 99c6eb8f5374..22bf6f11a0ed 100644
+index 6cfed54db654..22bf6f11a0ed 100644
--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81832,7 +79926,7 @@ index 99c6eb8f5374..22bf6f11a0ed 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81982,7 +80076,6 @@ index 99c6eb8f5374..22bf6f11a0ed 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -81992,10 +80085,6 @@ index 99c6eb8f5374..22bf6f11a0ed 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82023,7 +80112,7 @@ index 99c6eb8f5374..22bf6f11a0ed 100644
Library("sample_counter_gn")
diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index 43e96ee8102f..512ec69172c1 100644
+index 8bf1b02b4fa2..512ec69172c1 100644
--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82157,7 +80246,7 @@ index 43e96ee8102f..512ec69172c1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82189,16 +80278,9 @@ index 43e96ee8102f..512ec69172c1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82217,7 +80299,7 @@ index 43e96ee8102f..512ec69172c1 100644
-
Library("sanitizer_gn")
diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-index 86ef2dc1a70b..15d61fd11419 100644
+index 7d4c5ea206d3..15d61fd11419 100644
--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82242,7 +80324,7 @@ index 86ef2dc1a70b..15d61fd11419 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82400,7 +80482,6 @@ index 86ef2dc1a70b..15d61fd11419 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -82410,10 +80491,6 @@ index 86ef2dc1a70b..15d61fd11419 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82441,7 +80518,7 @@ index 86ef2dc1a70b..15d61fd11419 100644
Library("socket_address_gn")
diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-index 3a2f72d1e6b2..fc1bcda9d6bb 100644
+index c0df17e8819f..fc1bcda9d6bb 100644
--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82587,7 +80664,7 @@ index 3a2f72d1e6b2..fc1bcda9d6bb 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82619,16 +80696,9 @@ index 3a2f72d1e6b2..fc1bcda9d6bb 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82647,7 +80717,7 @@ index 3a2f72d1e6b2..fc1bcda9d6bb 100644
-
Library("socket_factory_gn")
diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
-index 0d1760a15cac..a3866ef3ba39 100644
+index 00013760662b..a3866ef3ba39 100644
--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82672,7 +80742,7 @@ index 0d1760a15cac..a3866ef3ba39 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82830,7 +80900,6 @@ index 0d1760a15cac..a3866ef3ba39 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -82840,10 +80909,6 @@ index 0d1760a15cac..a3866ef3ba39 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -82871,7 +80936,7 @@ index 0d1760a15cac..a3866ef3ba39 100644
Library("socket_gn")
diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-index 48972cbb4c6a..9177418df790 100644
+index e671f719bc98..9177418df790 100644
--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83017,7 +81082,7 @@ index 48972cbb4c6a..9177418df790 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83049,16 +81114,9 @@ index 48972cbb4c6a..9177418df790 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83077,7 +81135,7 @@ index 48972cbb4c6a..9177418df790 100644
-
Library("socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build
-index 4be1ae97668d..72d951163eca 100644
+index 66200fa70cc9..72d951163eca 100644
--- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83211,7 +81269,7 @@ index 4be1ae97668d..72d951163eca 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83243,16 +81301,9 @@ index 4be1ae97668d..72d951163eca 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83271,7 +81322,7 @@ index 4be1ae97668d..72d951163eca 100644
-
Library("ssl_gn")
diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index 58008d114a2b..9576a81b9996 100644
+index 3b7954e86e15..9576a81b9996 100644
--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83296,7 +81347,7 @@ index 58008d114a2b..9576a81b9996 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,178 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83446,7 +81497,6 @@ index 58008d114a2b..9576a81b9996 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -83456,10 +81506,6 @@ index 58008d114a2b..9576a81b9996 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83487,7 +81533,7 @@ index 58008d114a2b..9576a81b9996 100644
Library("stringutils_gn")
diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index 3bffe145d679..36cf22a65ed7 100644
+index b03cf379550c..36cf22a65ed7 100644
--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83625,7 +81671,7 @@ index 3bffe145d679..36cf22a65ed7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83657,16 +81703,9 @@ index 3bffe145d679..36cf22a65ed7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83685,7 +81724,7 @@ index 3bffe145d679..36cf22a65ed7 100644
-
Library("swap_queue_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index 979933060652..c0b7597564dc 100644
+index 197f9213a84a..c0b7597564dc 100644
--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83823,7 +81862,7 @@ index 979933060652..c0b7597564dc 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83855,16 +81894,9 @@ index 979933060652..c0b7597564dc 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -83883,7 +81915,7 @@ index 979933060652..c0b7597564dc 100644
-
Library("mutex_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-index a43e97a8c23c..4d146c5058d6 100644
+index 28788b4b653e..4d146c5058d6 100644
--- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83908,7 +81940,7 @@ index a43e97a8c23c..4d146c5058d6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84058,7 +82090,6 @@ index a43e97a8c23c..4d146c5058d6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -84068,10 +82099,6 @@ index a43e97a8c23c..4d146c5058d6 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -84099,7 +82126,7 @@ index a43e97a8c23c..4d146c5058d6 100644
Library("sequence_checker_internal_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-index ac962ac0a281..9649e4f55e8e 100644
+index 6e5fe912f1d7..9649e4f55e8e 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84124,7 +82151,7 @@ index ac962ac0a281..9649e4f55e8e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84270,7 +82297,6 @@ index ac962ac0a281..9649e4f55e8e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -84280,10 +82306,6 @@ index ac962ac0a281..9649e4f55e8e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -84311,7 +82333,7 @@ index ac962ac0a281..9649e4f55e8e 100644
Library("yield_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-index 7adceec9b45a..a11e7ba0278c 100644
+index df7b6a62b9af..a11e7ba0278c 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84336,7 +82358,7 @@ index 7adceec9b45a..a11e7ba0278c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84486,7 +82508,6 @@ index 7adceec9b45a..a11e7ba0278c 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -84496,10 +82517,6 @@ index 7adceec9b45a..a11e7ba0278c 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -84527,7 +82544,7 @@ index 7adceec9b45a..a11e7ba0278c 100644
Library("yield_policy_gn")
diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-index 136948d0f2b8..88c849682045 100644
+index c72b2b9951d5..88c849682045 100644
--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84661,7 +82678,7 @@ index 136948d0f2b8..88c849682045 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84693,16 +82710,9 @@ index 136948d0f2b8..88c849682045 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -84722,10 +82732,10 @@ index 136948d0f2b8..88c849682045 100644
Library("arch_gn")
diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
deleted file mode 100644
-index b99d782d883b..000000000000
+index 4a2dbbea32c2..000000000000
--- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
+++ /dev/null
-@@ -1,81 +0,0 @@
+@@ -1,80 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -84787,7 +82797,6 @@ index b99d782d883b..000000000000
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -84881,7 +82890,7 @@ index 429299b4807a..000000000000
-
-Library("cocoa_threading_gn")
diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-index 6d0a52310337..f1f0224d6a0f 100644
+index 4fdec8d73269..f1f0224d6a0f 100644
--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84906,7 +82915,7 @@ index 6d0a52310337..f1f0224d6a0f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85056,7 +83065,6 @@ index 6d0a52310337..f1f0224d6a0f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -85066,10 +83074,6 @@ index 6d0a52310337..f1f0224d6a0f 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -85170,7 +83174,7 @@ index 243694e1d552..000000000000
-
-Library("gcd_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index 61bbeefabcc6..6d4f5ece7c64 100644
+index 3406348246e9..6d4f5ece7c64 100644
--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85304,7 +83308,7 @@ index 61bbeefabcc6..6d4f5ece7c64 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85336,16 +83340,9 @@ index 61bbeefabcc6..6d4f5ece7c64 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -85364,7 +83361,7 @@ index 61bbeefabcc6..6d4f5ece7c64 100644
-
Library("ignore_warnings_gn")
diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index 574d7958f121..67980e94049a 100644
+index 4236cd7c5d0a..67980e94049a 100644
--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85498,7 +83495,7 @@ index 574d7958f121..67980e94049a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85530,16 +83527,9 @@ index 574d7958f121..67980e94049a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -85558,7 +83548,7 @@ index 574d7958f121..67980e94049a 100644
-
Library("inline_gn")
diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-index 4d51581c1b45..8b0594e1642f 100644
+index bcb6b0084898..8b0594e1642f 100644
--- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85692,7 +83682,7 @@ index 4d51581c1b45..8b0594e1642f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85724,16 +83714,9 @@ index 4d51581c1b45..8b0594e1642f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -85752,7 +83735,7 @@ index 4d51581c1b45..8b0594e1642f 100644
-
Library("no_unique_address_gn")
diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index e4d340d3c6be..807b97ad0643 100644
+index 4eb3c21325c7..807b97ad0643 100644
--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85886,7 +83869,7 @@ index e4d340d3c6be..807b97ad0643 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -85918,16 +83901,9 @@ index e4d340d3c6be..807b97ad0643 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -85946,7 +83922,7 @@ index e4d340d3c6be..807b97ad0643 100644
-
Library("rtc_export_gn")
diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-index c6dd8a6bab8f..8ba9c7a33e6b 100644
+index 25a3e4e088bc..8ba9c7a33e6b 100644
--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86080,7 +84056,7 @@ index c6dd8a6bab8f..8ba9c7a33e6b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -86112,16 +84088,9 @@ index c6dd8a6bab8f..8ba9c7a33e6b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -86140,7 +84109,7 @@ index c6dd8a6bab8f..8ba9c7a33e6b 100644
-
Library("unused_gn")
diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index 3aa57ac48eab..5fc4802fd2f4 100644
+index cc34279237df..5fc4802fd2f4 100644
--- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86274,7 +84243,7 @@ index 3aa57ac48eab..5fc4802fd2f4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -86306,16 +84275,9 @@ index 3aa57ac48eab..5fc4802fd2f4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -86334,7 +84296,7 @@ index 3aa57ac48eab..5fc4802fd2f4 100644
-
Library("warn_current_thread_is_deadlocked_gn")
diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-index 224f77682849..fc5427430c09 100644
+index ffe3228fdc53..fc5427430c09 100644
--- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
+++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86359,7 +84321,7 @@ index 224f77682849..fc5427430c09 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,194 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86520,7 +84482,6 @@ index 224f77682849..fc5427430c09 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -86530,10 +84491,6 @@ index 224f77682849..fc5427430c09 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -86561,7 +84518,7 @@ index 224f77682849..fc5427430c09 100644
Library("repeating_task_gn")
diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-index 0d35da2f19ba..6a868ab4ba72 100644
+index 18384b6a382b..6a868ab4ba72 100644
--- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
+++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86586,7 +84543,7 @@ index 0d35da2f19ba..6a868ab4ba72 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86736,7 +84693,6 @@ index 0d35da2f19ba..6a868ab4ba72 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -86746,10 +84702,6 @@ index 0d35da2f19ba..6a868ab4ba72 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -86777,7 +84729,7 @@ index 0d35da2f19ba..6a868ab4ba72 100644
Library("base64_gn")
diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-index 906a4a9e8155..2005c1b47194 100644
+index b5b20ed538d7..2005c1b47194 100644
--- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
+++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86802,7 +84754,7 @@ index 906a4a9e8155..2005c1b47194 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86948,7 +84900,6 @@ index 906a4a9e8155..2005c1b47194 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -86958,10 +84909,6 @@ index 906a4a9e8155..2005c1b47194 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -86989,7 +84936,7 @@ index 906a4a9e8155..2005c1b47194 100644
Library("sigslot_gn")
diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
-index 199af4b1d30e..71991469ebe2 100644
+index 1ed74bfaad66..468c64eb06b7 100644
--- third_party/libwebrtc/rtc_base/threading_gn/moz.build
+++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87014,7 +84961,7 @@ index 199af4b1d30e..71991469ebe2 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,186 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87172,7 +85119,6 @@ index 199af4b1d30e..71991469ebe2 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -87182,10 +85128,6 @@ index 199af4b1d30e..71991469ebe2 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -87213,7 +85155,7 @@ index 199af4b1d30e..71991469ebe2 100644
Library("threading_gn")
diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index c4eb7ac8de41..29f5854612cb 100644
+index c74be7306353..29f5854612cb 100644
--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
@@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -87239,7 +85181,7 @@ index c4eb7ac8de41..29f5854612cb 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87396,7 +85338,6 @@ index c4eb7ac8de41..29f5854612cb 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -87406,10 +85347,6 @@ index c4eb7ac8de41..29f5854612cb 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -87437,7 +85374,7 @@ index c4eb7ac8de41..29f5854612cb 100644
Library("timeutils_gn")
diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index 1f72327af376..4b0f96afeafd 100644
+index 9b5c10f949e9..4b0f96afeafd 100644
--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87571,7 +85508,7 @@ index 1f72327af376..4b0f96afeafd 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -87603,16 +85540,9 @@ index 1f72327af376..4b0f96afeafd 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -87631,7 +85561,7 @@ index 1f72327af376..4b0f96afeafd 100644
-
Library("type_traits_gn")
diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-index 975562a20870..e32671858969 100644
+index 8b55572cb5df..e32671858969 100644
--- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87765,7 +85695,7 @@ index 975562a20870..e32671858969 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -87797,16 +85727,9 @@ index 975562a20870..e32671858969 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -87825,7 +85748,7 @@ index 975562a20870..e32671858969 100644
-
Library("unique_id_generator_gn")
diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index bb68c4ea3c97..501410447cce 100644
+index 259ef161a265..501410447cce 100644
--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87963,7 +85886,7 @@ index bb68c4ea3c97..501410447cce 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -87995,16 +85918,9 @@ index bb68c4ea3c97..501410447cce 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -88023,7 +85939,7 @@ index bb68c4ea3c97..501410447cce 100644
-
Library("unit_base_gn")
diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-index a7cf9dd19e0f..6cb2d2ab092b 100644
+index 42342eee8be2..6cb2d2ab092b 100644
--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -88048,7 +85964,7 @@ index a7cf9dd19e0f..6cb2d2ab092b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88198,7 +86114,6 @@ index a7cf9dd19e0f..6cb2d2ab092b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -88208,10 +86123,6 @@ index a7cf9dd19e0f..6cb2d2ab092b 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -88701,7 +86612,7 @@ index 607a23eb5e96..000000000000
-
-Library("win32_gn")
diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-index 1029a25252bc..0eae58b028b7 100644
+index 0b8ed4f70c80..0eae58b028b7 100644
--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -88726,7 +86637,7 @@ index 1029a25252bc..0eae58b028b7 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88876,7 +86787,6 @@ index 1029a25252bc..0eae58b028b7 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -88886,10 +86796,6 @@ index 1029a25252bc..0eae58b028b7 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89238,7 +87144,7 @@ index 9e7f52704a52..000000000000
-
-Library("videoframebuffer_objc_gn")
diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
-index 5a007d6343e2..e58095f60b94 100644
+index e4ee1a2ead8c..e58095f60b94 100644
--- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89263,7 +87169,7 @@ index 5a007d6343e2..e58095f60b94 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89413,7 +87319,6 @@ index 5a007d6343e2..e58095f60b94 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -89423,10 +87328,6 @@ index 5a007d6343e2..e58095f60b94 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89454,7 +87355,7 @@ index 5a007d6343e2..e58095f60b94 100644
Library("denormal_disabler_gn")
diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-index e23512e42579..5b24ada78a23 100644
+index 2535fad4cc02..5b24ada78a23 100644
--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89479,7 +87380,7 @@ index e23512e42579..5b24ada78a23 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89636,7 +87537,6 @@ index e23512e42579..5b24ada78a23 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -89646,10 +87546,6 @@ index e23512e42579..5b24ada78a23 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89677,7 +87573,7 @@ index e23512e42579..5b24ada78a23 100644
Library("field_trial_gn")
diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-index aa35ad0401a8..1da178fc929e 100644
+index 484fc0d3caee..1da178fc929e 100644
--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89702,7 +87598,7 @@ index aa35ad0401a8..1da178fc929e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89852,7 +87748,6 @@ index aa35ad0401a8..1da178fc929e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -89862,10 +87757,6 @@ index aa35ad0401a8..1da178fc929e 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -89893,7 +87784,7 @@ index aa35ad0401a8..1da178fc929e 100644
Library("metrics_gn")
diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-index e53ea6babd3d..df52edb77169 100644
+index 3b2e26249ed4..df52edb77169 100644
--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89918,7 +87809,7 @@ index e53ea6babd3d..df52edb77169 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,204 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,199 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90089,7 +87980,6 @@ index e53ea6babd3d..df52edb77169 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -90099,10 +87989,6 @@ index e53ea6babd3d..df52edb77169 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90130,7 +88016,7 @@ index e53ea6babd3d..df52edb77169 100644
Library("system_wrappers_gn")
diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index f3ffb448cd30..e86bdab557d1 100644
+index 5f400c69f937..e86bdab557d1 100644
--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -90280,7 +88166,7 @@ index f3ffb448cd30..e86bdab557d1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -90312,16 +88198,9 @@ index f3ffb448cd30..e86bdab557d1 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90340,7 +88219,7 @@ index f3ffb448cd30..e86bdab557d1 100644
-
Library("rtp_test_utils_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
-index f0562eabf500..a07cf094c60f 100644
+index 95f5f7773064..a07cf094c60f 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90355,7 +88234,7 @@ index f0562eabf500..a07cf094c60f 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90432,16 +88311,16 @@ index f0562eabf500..a07cf094c60f 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -90454,16 +88333,9 @@ index f0562eabf500..a07cf094c60f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90482,7 +88354,7 @@ index f0562eabf500..a07cf094c60f 100644
-
Library("algorithm_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
-index 74a9d1986ea5..ea98e82e69b0 100644
+index 3289a5ec7748..ea98e82e69b0 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90497,7 +88369,7 @@ index 74a9d1986ea5..ea98e82e69b0 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90574,16 +88446,16 @@ index 74a9d1986ea5..ea98e82e69b0 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -90596,16 +88468,9 @@ index 74a9d1986ea5..ea98e82e69b0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90624,7 +88489,7 @@ index 74a9d1986ea5..ea98e82e69b0 100644
-
Library("container_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
-index e3b931a7b2fe..49c783cd4c81 100644
+index 3995b3210309..49c783cd4c81 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90639,7 +88504,7 @@ index e3b931a7b2fe..49c783cd4c81 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90716,16 +88581,16 @@ index e3b931a7b2fe..49c783cd4c81 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -90738,16 +88603,9 @@ index e3b931a7b2fe..49c783cd4c81 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90766,7 +88624,7 @@ index e3b931a7b2fe..49c783cd4c81 100644
-
Library("atomic_hook_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
-index 783c3186bb9e..ac7916a85e5d 100644
+index a7dd82d8f3c1..ac7916a85e5d 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90781,7 +88639,7 @@ index 783c3186bb9e..ac7916a85e5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90858,16 +88716,16 @@ index 783c3186bb9e..ac7916a85e5d 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -90880,16 +88738,9 @@ index 783c3186bb9e..ac7916a85e5d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -90908,7 +88759,7 @@ index 783c3186bb9e..ac7916a85e5d 100644
-
Library("base_internal_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
-index ba78602e5eea..a1d553dad6db 100644
+index 0018526d3581..a1d553dad6db 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90923,7 +88774,7 @@ index ba78602e5eea..a1d553dad6db 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91000,16 +88851,16 @@ index ba78602e5eea..a1d553dad6db 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91022,16 +88873,9 @@ index ba78602e5eea..a1d553dad6db 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -91050,7 +88894,7 @@ index ba78602e5eea..a1d553dad6db 100644
-
Library("config_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
-index e19ecba14a74..3e445069597d 100644
+index 781c7ab8f05b..3e445069597d 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91065,7 +88909,7 @@ index e19ecba14a74..3e445069597d 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91142,16 +88986,16 @@ index e19ecba14a74..3e445069597d 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91164,16 +89008,9 @@ index e19ecba14a74..3e445069597d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -91192,7 +89029,7 @@ index e19ecba14a74..3e445069597d 100644
-
Library("core_headers_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
-index a24939362860..e80e5c86aaea 100644
+index 04d6ac388069..e80e5c86aaea 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91207,7 +89044,7 @@ index a24939362860..e80e5c86aaea 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91294,12 +89131,12 @@ index a24939362860..e80e5c86aaea 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91311,22 +89148,19 @@ index a24939362860..e80e5c86aaea 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -91334,23 +89168,21 @@ index a24939362860..e80e5c86aaea 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("log_severity_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build
-index 04d1e20cacc1..e31c08d5328e 100644
+index d7a0c48a78b8..e31c08d5328e 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91365,7 +89197,7 @@ index 04d1e20cacc1..e31c08d5328e 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91442,16 +89274,16 @@ index 04d1e20cacc1..e31c08d5328e 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91464,16 +89296,9 @@ index 04d1e20cacc1..e31c08d5328e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -91492,7 +89317,7 @@ index 04d1e20cacc1..e31c08d5328e 100644
-
Library("nullability_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
-index 8402338b9899..d3b730672fc6 100644
+index b4d000282990..d3b730672fc6 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91507,7 +89332,7 @@ index 8402338b9899..d3b730672fc6 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91594,12 +89419,12 @@ index 8402338b9899..d3b730672fc6 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91611,22 +89436,19 @@ index 8402338b9899..d3b730672fc6 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -91634,23 +89456,21 @@ index 8402338b9899..d3b730672fc6 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("raw_logging_internal_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
-index 78f0a49f704c..04e6ae930cb3 100644
+index 26e7ca140221..04e6ae930cb3 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91665,7 +89485,7 @@ index 78f0a49f704c..04e6ae930cb3 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91752,12 +89572,12 @@ index 78f0a49f704c..04e6ae930cb3 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91769,22 +89589,19 @@ index 78f0a49f704c..04e6ae930cb3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -91792,23 +89609,21 @@ index 78f0a49f704c..04e6ae930cb3 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("throw_delegate_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
-index 590a21038a80..367c6bd433a3 100644
+index 2b964a65934e..367c6bd433a3 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91823,7 +89638,7 @@ index 590a21038a80..367c6bd433a3 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91900,16 +89715,16 @@ index 590a21038a80..367c6bd433a3 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -91922,16 +89737,9 @@ index 590a21038a80..367c6bd433a3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -91950,7 +89758,7 @@ index 590a21038a80..367c6bd433a3 100644
-
Library("cleanup_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
-index 269410ddabce..3f4fc9ed0f88 100644
+index cc42f6b1cf95..3f4fc9ed0f88 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91965,7 +89773,7 @@ index 269410ddabce..3f4fc9ed0f88 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92042,16 +89850,16 @@ index 269410ddabce..3f4fc9ed0f88 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92064,16 +89872,9 @@ index 269410ddabce..3f4fc9ed0f88 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92092,7 +89893,7 @@ index 269410ddabce..3f4fc9ed0f88 100644
-
Library("cleanup_internal_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
-index ee9640db8bb1..38403c4daf5f 100644
+index be74f2073fb9..38403c4daf5f 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92107,7 +89908,7 @@ index ee9640db8bb1..38403c4daf5f 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92184,16 +89985,16 @@ index ee9640db8bb1..38403c4daf5f 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92206,16 +90007,9 @@ index ee9640db8bb1..38403c4daf5f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92234,7 +90028,7 @@ index ee9640db8bb1..38403c4daf5f 100644
-
Library("compressed_tuple_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
-index bdf3ab137437..f3c3c2ec8183 100644
+index 6007158942e5..f3c3c2ec8183 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92249,7 +90043,7 @@ index bdf3ab137437..f3c3c2ec8183 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92326,16 +90120,16 @@ index bdf3ab137437..f3c3c2ec8183 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92348,16 +90142,9 @@ index bdf3ab137437..f3c3c2ec8183 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92376,7 +90163,7 @@ index bdf3ab137437..f3c3c2ec8183 100644
-
Library("inlined_vector_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
-index a77c5b9bbf02..b5c250da1c55 100644
+index 67fafc74cc9f..b5c250da1c55 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92391,7 +90178,7 @@ index a77c5b9bbf02..b5c250da1c55 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92468,16 +90255,16 @@ index a77c5b9bbf02..b5c250da1c55 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92490,16 +90277,9 @@ index a77c5b9bbf02..b5c250da1c55 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92518,7 +90298,7 @@ index a77c5b9bbf02..b5c250da1c55 100644
-
Library("inlined_vector_internal_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
-index 34944872348d..8cc78181cb75 100644
+index a7dc8399fa1a..8cc78181cb75 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92533,7 +90313,7 @@ index 34944872348d..8cc78181cb75 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92610,16 +90390,16 @@ index 34944872348d..8cc78181cb75 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92632,16 +90412,9 @@ index 34944872348d..8cc78181cb75 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92660,7 +90433,7 @@ index 34944872348d..8cc78181cb75 100644
-
Library("any_invocable_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
-index 564670abf0d0..5c92f038c84f 100644
+index 7d7ddda3ab0d..5c92f038c84f 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92675,7 +90448,7 @@ index 564670abf0d0..5c92f038c84f 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92752,16 +90525,16 @@ index 564670abf0d0..5c92f038c84f 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92774,16 +90547,9 @@ index 564670abf0d0..5c92f038c84f 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92802,7 +90568,7 @@ index 564670abf0d0..5c92f038c84f 100644
-
Library("bind_front_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
-index bd6abd19836c..cf5df0d3048a 100644
+index 011681082bcb..cf5df0d3048a 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92817,7 +90583,7 @@ index bd6abd19836c..cf5df0d3048a 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92894,16 +90660,16 @@ index bd6abd19836c..cf5df0d3048a 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -92916,16 +90682,9 @@ index bd6abd19836c..cf5df0d3048a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -92944,7 +90703,7 @@ index bd6abd19836c..cf5df0d3048a 100644
-
Library("memory_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
-index 5d0b080cb880..d7c6a3f7be95 100644
+index be165cdd324a..d7c6a3f7be95 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92959,7 +90718,7 @@ index 5d0b080cb880..d7c6a3f7be95 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93036,16 +90795,16 @@ index 5d0b080cb880..d7c6a3f7be95 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93058,16 +90817,9 @@ index 5d0b080cb880..d7c6a3f7be95 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -93086,7 +90838,7 @@ index 5d0b080cb880..d7c6a3f7be95 100644
-
Library("type_traits_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
-index 1923a18b1f3d..09fa161e8735 100644
+index f08ba233b08c..09fa161e8735 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -93101,7 +90853,7 @@ index 1923a18b1f3d..09fa161e8735 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93178,16 +90930,16 @@ index 1923a18b1f3d..09fa161e8735 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93200,16 +90952,9 @@ index 1923a18b1f3d..09fa161e8735 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -93228,7 +90973,7 @@ index 1923a18b1f3d..09fa161e8735 100644
-
Library("bits_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
-index ec45e9281f85..947feb765e92 100644
+index 48c148b03927..947feb765e92 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -93243,7 +90988,7 @@ index ec45e9281f85..947feb765e92 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93330,12 +91075,12 @@ index ec45e9281f85..947feb765e92 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93347,22 +91092,19 @@ index ec45e9281f85..947feb765e92 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -93370,23 +91112,21 @@ index ec45e9281f85..947feb765e92 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("int128_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build
-index 16fa4aa49383..7a2c3c58f1a3 100644
+index 2dd442a89eeb..7a2c3c58f1a3 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -93401,7 +91141,7 @@ index 16fa4aa49383..7a2c3c58f1a3 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93488,12 +91228,12 @@ index 16fa4aa49383..7a2c3c58f1a3 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93505,22 +91245,19 @@ index 16fa4aa49383..7a2c3c58f1a3 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -93528,23 +91265,21 @@ index 16fa4aa49383..7a2c3c58f1a3 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("string_view_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
-index f748c5d9c15f..26ad6583df10 100644
+index 84461a1a2896..26ad6583df10 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -93559,7 +91294,7 @@ index f748c5d9c15f..26ad6583df10 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,138 +46,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,133 +46,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93646,12 +91381,12 @@ index f748c5d9c15f..26ad6583df10 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93663,22 +91398,19 @@ index f748c5d9c15f..26ad6583df10 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -93686,23 +91418,21 @@ index f748c5d9c15f..26ad6583df10 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("strings_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
-index a2eeaa3f05f3..c963ce692f25 100644
+index 71a47188d400..c963ce692f25 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -93717,7 +91447,7 @@ index a2eeaa3f05f3..c963ce692f25 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93804,12 +91534,12 @@ index a2eeaa3f05f3..c963ce692f25 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93821,22 +91551,19 @@ index a2eeaa3f05f3..c963ce692f25 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -93844,23 +91571,21 @@ index a2eeaa3f05f3..c963ce692f25 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("bad_optional_access_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
-index e20623795d69..5d0ddb736b8b 100644
+index d46074339fc9..5d0ddb736b8b 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -93875,7 +91600,7 @@ index e20623795d69..5d0ddb736b8b 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93962,12 +91687,12 @@ index e20623795d69..5d0ddb736b8b 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
- DEFINES["_DEBUG"] = True
-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -93979,22 +91704,19 @@ index e20623795d69..5d0ddb736b8b 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -94002,23 +91724,21 @@ index e20623795d69..5d0ddb736b8b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("bad_variant_access_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
-index 252d8a837643..f68149f85c45 100644
+index 7d3070b20045..f68149f85c45 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -94033,7 +91753,7 @@ index 252d8a837643..f68149f85c45 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94110,16 +91830,16 @@ index 252d8a837643..f68149f85c45 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -94132,16 +91852,9 @@ index 252d8a837643..f68149f85c45 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94160,7 +91873,7 @@ index 252d8a837643..f68149f85c45 100644
-
Library("optional_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
-index 91f8106b2788..293b2b62e2e5 100644
+index 37133145c258..293b2b62e2e5 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -94175,7 +91888,7 @@ index 91f8106b2788..293b2b62e2e5 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94252,16 +91965,16 @@ index 91f8106b2788..293b2b62e2e5 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -94274,16 +91987,9 @@ index 91f8106b2788..293b2b62e2e5 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94302,7 +92008,7 @@ index 91f8106b2788..293b2b62e2e5 100644
-
Library("span_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
-index 1f2c40273d74..59ea6584a0f4 100644
+index fd47ce4b3650..59ea6584a0f4 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -94317,7 +92023,7 @@ index 1f2c40273d74..59ea6584a0f4 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94394,16 +92100,16 @@ index 1f2c40273d74..59ea6584a0f4 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -94416,16 +92122,9 @@ index 1f2c40273d74..59ea6584a0f4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94444,7 +92143,7 @@ index 1f2c40273d74..59ea6584a0f4 100644
-
Library("variant_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
-index 172b27fecbd9..c06e16fa60f4 100644
+index 8a8c4fd3406a..c06e16fa60f4 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -94459,7 +92158,7 @@ index 172b27fecbd9..c06e16fa60f4 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94536,16 +92235,16 @@ index 172b27fecbd9..c06e16fa60f4 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -94558,16 +92257,9 @@ index 172b27fecbd9..c06e16fa60f4 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94733,7 +92425,7 @@ index 000380105901..ef88818e351d 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index 5c9e66f4083d..bec84e2f5a4d 100644
+index ed639610edb8..bec84e2f5a4d 100644
--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -94867,7 +92559,7 @@ index 5c9e66f4083d..bec84e2f5a4d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -151,57 +71,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +71,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94899,16 +92591,9 @@ index 5c9e66f4083d..bec84e2f5a4d 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -94927,7 +92612,7 @@ index 5c9e66f4083d..bec84e2f5a4d 100644
-
Library("yuv_gn")
diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-index ee4fd18a3eb4..e3c3b4dc2ce0 100644
+index f1aad5d0b448..e3c3b4dc2ce0 100644
--- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
+++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
@@ -9,6 +9,14 @@
@@ -95034,7 +92719,7 @@ index ee4fd18a3eb4..e3c3b4dc2ce0 100644
if CONFIG["TARGET_CPU"] == "ppc64":
-@@ -123,65 +59,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -123,60 +59,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
DEFINES["PFFFT_SIMD_DISABLE"] = True
@@ -95065,7 +92750,6 @@ index ee4fd18a3eb4..e3c3b4dc2ce0 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -95076,10 +92760,6 @@ index ee4fd18a3eb4..e3c3b4dc2ce0 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
@@ -95154,7 +92834,7 @@ index 6209fa98cc55..bc0fbed530b4 100644
DEFINES["USE_X11"] = "1"
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 afb7f87ccf80..7c0c3d96945e 100644
+index 7122118c08c9..7c0c3d96945e 100644
--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
@@ -9,6 +9,14 @@
@@ -95172,7 +92852,7 @@ index afb7f87ccf80..7c0c3d96945e 100644
FINAL_LIBRARY = "webrtc"
-@@ -33,144 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -33,139 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95261,12 +92941,12 @@ index afb7f87ccf80..7c0c3d96945e 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
DEFINES["_DEBUG"] = True
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
@@ -95282,22 +92962,19 @@ index afb7f87ccf80..7c0c3d96945e 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
++if CONFIG["TARGET_CPU"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -95305,23 +92982,21 @@ index afb7f87ccf80..7c0c3d96945e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
+-
- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index 2d1fd69ed05d..ee1b5000f55a 100644
+index 18d29da55678..ee1b5000f55a 100644
--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95346,7 +93021,7 @@ index 2d1fd69ed05d..ee1b5000f55a 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,195 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95508,7 +93183,6 @@ index 2d1fd69ed05d..ee1b5000f55a 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -95518,10 +93192,6 @@ index 2d1fd69ed05d..ee1b5000f55a 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -95549,7 +93219,7 @@ index 2d1fd69ed05d..ee1b5000f55a 100644
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-index 1c2c9ef83579..f417c976fc09 100644
+index 4dbe7bf32c49..f417c976fc09 100644
--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95574,7 +93244,7 @@ index 1c2c9ef83579..f417c976fc09 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95731,7 +93401,6 @@ index 1c2c9ef83579..f417c976fc09 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
- OS_LIBS += [
-- "android_support",
- "unwind"
- ]
-
@@ -95741,10 +93410,6 @@ index 1c2c9ef83579..f417c976fc09 100644
"-msse2"
]
-- OS_LIBS += [
-- "android_support"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -95772,7 +93437,7 @@ index 1c2c9ef83579..f417c976fc09 100644
Library("encoder_config_gn")
diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index e2d2f9963d84..bf53b31dbe77 100644
+index c34883fb3730..bf53b31dbe77 100644
--- third_party/libwebrtc/video/config/streams_config_gn/moz.build
+++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95797,7 +93462,7 @@ index e2d2f9963d84..bf53b31dbe77 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,195 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95959,7 +93624,6 @@ index e2d2f9963d84..bf53b31dbe77 100644
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TAR