diff options
Diffstat (limited to 'www/librewolf/files')
| -rw-r--r-- | www/librewolf/files/patch-bug1628567 | 32 | ||||
| -rw-r--r-- | www/librewolf/files/patch-bug1876366 | 201 | ||||
| -rw-r--r-- | www/librewolf/files/patch-dom_media_flac_FlacDecoder.cpp | 23 | ||||
| -rw-r--r-- | www/librewolf/files/patch-libwebrtc-generated | 5879 | ||||
| -rw-r--r-- | www/librewolf/files/patch-rust-1.78.0 | 3542 | ||||
| -rw-r--r-- | www/librewolf/files/patch-rust-1.78.0-arm | 60 | ||||
| -rw-r--r-- | www/librewolf/files/patch-wayland-proxy | 15 | ||||
| -rw-r--r-- | www/librewolf/files/unity-menubar.patch | 5268 |
8 files changed, 1848 insertions, 13172 deletions
diff --git a/www/librewolf/files/patch-bug1628567 b/www/librewolf/files/patch-bug1628567 deleted file mode 100644 index 003ba36d3ad1..000000000000 --- a/www/librewolf/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/librewolf/files/patch-bug1876366 b/www/librewolf/files/patch-bug1876366 index a6f39ffabab8..78483c3fbab7 100644 --- a/www/librewolf/files/patch-bug1876366 +++ b/www/librewolf/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/librewolf/files/patch-dom_media_flac_FlacDecoder.cpp b/www/librewolf/files/patch-dom_media_flac_FlacDecoder.cpp deleted file mode 100644 index 6dc197d9455e..000000000000 --- a/www/librewolf/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/librewolf/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated index 73b01ec37c0c..a56d291ae041 100644 --- a/www/librewolf/files/patch-libwebrtc-generated +++ b/www/librewolf/files/patch-libwebrtc-generated @@ -1,10 +1,10 @@ -commit dc3c9060f191382e543c26328f99a06f10176309 +commit e0f8f58bed7cc4cd65c82ef0ea0e795ac6eeda65 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> - regenerate FreeBSD libwebrtc patch for Firefox 124 + regenerate FreeBSD libwebrtc patch for Firefox 126 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 @@ -6685,10 +6510,10 @@ index 5c4a7f29a005..93c7cd55cf2e 100644 - DEFINES["_GNU_SOURCE"] = True - 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 ---- third_party/libwebrtc/api/callfactory_api_gn/moz.build -+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build +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 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() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -6711,7 +6536,7 @@ index a67107994317..d9e58de1c43a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6759,10 +6584,6 @@ index a67107994317..d9e58de1c43a 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -6803,13 +6624,6 @@ index a67107994317..d9e58de1c43a 100644 - 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": @@ -6835,7 +6649,7 @@ index a67107994317..d9e58de1c43a 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -164,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -6867,16 +6681,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 @@ -6893,11 +6700,11 @@ index a67107994317..d9e58de1c43a 100644 - - DEFINES["_GNU_SOURCE"] = True - - 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 ---- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build + 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 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() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -7033,7 +6840,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 +6872,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 @@ -7091,11 +6891,11 @@ index 65794fbdd2ac..1f0c3440b172 100644 - - DEFINES["_GNU_SOURCE"] = True - - 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 ---- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build + 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 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() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -7118,7 +6918,7 @@ index 19352a6da41c..2f5ff0067bee 100644 FINAL_LIBRARY = "webrtc" -@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7137,10 +6937,6 @@ index 19352a6da41c..2f5ff0067bee 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -7215,6 +7011,10 @@ index 19352a6da41c..2f5ff0067bee 100644 -if CONFIG["TARGET_CPU"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -7231,10 +7031,12 @@ index 19352a6da41c..2f5ff0067bee 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7256,23 +7058,21 @@ index 19352a6da41c..2f5ff0067bee 100644 - 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" - +- +- 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": - -- OS_LIBS += [ -- "android_support" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -7282,18 +7082,27 @@ index 19352a6da41c..2f5ff0067bee 100644 - 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 -- - 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 ---- third_party/libwebrtc/api/crypto/options_gn/moz.build -+++ third_party/libwebrtc/api/crypto/options_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + Library("options_gn") +diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build +index 77a2224baf94..5c7930031464 100644 +--- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build ++++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -7316,7 +7125,7 @@ index 3219fce47f9c..33542ced4242 100644 FINAL_LIBRARY = "webrtc" -@@ -43,179 +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" @@ -7335,6 +7144,10 @@ index 3219fce47f9c..33542ced4242 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -7360,6 +7173,10 @@ index 3219fce47f9c..33542ced4242 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -7400,6 +7217,13 @@ index 3219fce47f9c..33542ced4242 100644 - 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": @@ -7462,7 +7286,6 @@ index 3219fce47f9c..33542ced4242 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -7472,10 +7295,6 @@ index 3219fce47f9c..33542ced4242 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -7501,9 +7320,196 @@ index 3219fce47f9c..33542ced4242 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("options_gn") + Library("environment_factory_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 +7647,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 +7679,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 +7700,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 +7725,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 +7882,6 @@ index 5133134fc268..bbfe2fc66a9b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -7893,10 +7891,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 +7918,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 +8052,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 +8084,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 +8105,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 +8250,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 +8282,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 +8303,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 +8441,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 +8473,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 +8494,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 +8628,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 +8660,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 +8681,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 +8815,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 +8847,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 +8868,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 +9002,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 +9034,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 +9055,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 +9189,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 +9221,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 +9242,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 +9267,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 +9424,6 @@ index b066645cd26c..67560deca0bc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -9489,10 +9433,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 +9460,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 +9598,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 +9630,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 +9651,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 +9676,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 +9837,6 @@ index 75602ac5122a..9f85d1d43198 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -9914,10 +9846,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 +9873,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 +9898,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 +10059,6 @@ index 7c4e1c550a82..45a550ec1872 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -10141,10 +10068,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 +10095,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 +10244,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 +10276,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 +10297,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 +10322,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 +10472,6 @@ index 8106b395ca55..6b28cb62c9fc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -10566,10 +10481,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 +10508,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 +10642,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 +10674,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 +10695,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 +10829,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 +10861,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 +11067,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 +11203,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 +11235,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 +11256,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 +11281,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 +11438,6 @@ index 19bee500727e..b394febab922 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -11371,10 +11447,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 +11474,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 +11499,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 +11656,6 @@ index 1965bc7a12dd..dde96c64f726 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -11594,10 +11665,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 +11692,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 +11717,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 +11874,6 @@ index 7328eb81c013..84b819ba9e90 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -11817,10 +11883,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 +11910,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 +11935,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 +12092,6 @@ index 92eb6cb3693b..50846adb8b4e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -12040,10 +12101,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 +12128,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 +12153,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 +12303,6 @@ index 480114ad07dd..9330001cc876 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -12256,10 +12312,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 +12339,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 +12473,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 +12505,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 +12526,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 +12551,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 +12708,6 @@ index f8cd38576d8e..fc343fe57be9 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -12673,10 +12717,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 +12744,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 +12878,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 +12910,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 +12931,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 +13065,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 +13097,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 +13118,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 +13256,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 +13288,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 +13309,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 +13447,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,14 +13479,194 @@ 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": +-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("simulated_network_api_gn") +diff --git third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build +index 0911b84473f5..2525ec25c7b0 100644 +--- third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build ++++ third_party/libwebrtc/api/task_queue/default_task_queue_factory_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": @@ -13486,9 +13685,9 @@ index b46ec1656b48..26728a141487 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("simulated_network_api_gn") + Library("default_task_queue_factory_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 +13712,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 +13862,6 @@ index 52a2e5003b5a..e8094ed7f16d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -13673,10 +13871,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 +13898,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 +13923,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 +14073,6 @@ index 73630a2ad988..e9f40adf5dcc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -13889,10 +14082,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 +14109,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 +14134,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 +14280,6 @@ index d99d149fa37c..716e91c361d1 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -14101,10 +14289,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 +14316,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 +14461,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 +14493,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 +14514,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 +14539,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 +14696,6 @@ index fd2b2dd12b03..10d7b6bb4d54 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -14529,10 +14705,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 +14732,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 +14757,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 +14919,6 @@ index 4a7c84915c5e..929cc485f211 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -14757,10 +14928,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 +14955,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 +14980,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 +15137,6 @@ index 76dd117a863f..a67647ff4e6a 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -14980,10 +15146,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 +15173,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 +15198,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 +15348,6 @@ index a2fe75e60e9b..cf683816e0d6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -15196,10 +15357,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 +15384,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 +15529,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 +15561,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 +15582,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 +15716,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 +15748,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 +15769,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 +15794,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 +15944,6 @@ index af080bee0bd0..f01561893920 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -15811,10 +15953,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 +15980,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 +16005,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 +16155,6 @@ index 4964c3e05f88..91d77bc12c86 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -16027,10 +16164,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 +16191,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 +16216,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 +16366,6 @@ index 0fe0bc100b9e..31b25242e9a9 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -16243,10 +16375,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 +16402,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 +16427,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 +16577,6 @@ index 413a57a8f3c4..f780d340c448 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -16459,10 +16586,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 +16613,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 +16638,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 +16788,6 @@ index 39355ed5881c..2df892f4a708 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -16675,10 +16797,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 +16824,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 +16849,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 +16999,6 @@ index da68eea1608b..f4f43207ca71 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -16891,10 +17008,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 +17035,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 +17060,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 +17222,6 @@ index cb32b05fa6ce..114f6b43ad03 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -17119,10 +17231,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 +17258,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 +17283,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 +17440,6 @@ index fdb34bf903a5..3aab4972d1b0 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -17342,10 +17449,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 +17476,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 +17501,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 +17658,6 @@ index 3bc012ad2867..9bbfe7ab6b7c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -17565,10 +17667,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 +17694,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 +17719,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 +17881,6 @@ index 2614e67133bc..b0ddb83924e2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -17793,10 +17890,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 +17917,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 +18062,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 +18094,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 +18115,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 +18249,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 +18281,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 +18302,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 +18436,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 +18468,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 +18489,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 +18514,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 +18664,6 @@ index ffff5639eeef..26cb2efe4e07 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -18602,10 +18673,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 +18700,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 +18725,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 +18875,6 @@ index be63dc82523f..a7dbc316cfc0 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -18818,10 +18884,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 +18911,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 +19056,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 +19088,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 +19109,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 +19134,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 +19284,6 @@ index e7f3f5a4de36..d83935fe0710 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -19239,10 +19293,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 +19320,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 +19454,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 +19486,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 +19507,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 +19532,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 +19689,6 @@ index b0fc90582b6e..67fafe98aa0c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -19656,10 +19698,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 +19725,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 +19750,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 +19907,6 @@ index 7fe6e4df955d..7b3d8fef889c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -19879,10 +19916,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 +19943,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 +19968,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 +20125,6 @@ index d80dda91786b..900162a802f7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -20102,10 +20134,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 +20161,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 +20299,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 +20331,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 +20352,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 +20490,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 +20522,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 +20543,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 +20568,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 +20725,6 @@ index f65965f80bcd..039f412a6c99 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -20721,10 +20734,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 +20761,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 +20906,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 +20938,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 +20959,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 +21097,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 +21129,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 +21150,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 +21175,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 +21337,6 @@ index 4e928c91a430..554a2bc0b150 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -21352,10 +21346,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 +21373,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 +21398,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 +21548,6 @@ index d63795ed948e..874d12b31e06 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -21568,10 +21557,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 +21584,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 +21609,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 +21766,6 @@ index 89cce4215bb6..c866cb6d800f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -21791,10 +21775,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 +21802,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 +21827,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 +21989,6 @@ index e757e9ed510c..eff6026011a0 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -22019,10 +21998,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 +22025,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 +22159,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 +22191,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 +22212,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 +22237,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 +22399,6 @@ index e81a4f673bac..bb58c94c5403 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -22441,10 +22408,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 +22435,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 +22460,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 +22621,6 @@ index e215792f649d..aab0bc81b0aa 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -22668,10 +22630,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 +22657,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 +22682,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 +22844,6 @@ index d8893a734152..6e627cb67c35 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -22896,10 +22853,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 +22880,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 +23025,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 +23057,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 +23078,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 +23103,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 +23264,6 @@ index a56b55faf3bc..79b7f726fe25 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -23328,10 +23273,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 +23300,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 +23325,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 +23486,6 @@ index e6f73025aa61..d5840ec1a784 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -23555,10 +23495,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 +23522,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 +23547,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 +23709,6 @@ index 25c1961b89ae..172d26827022 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -23783,10 +23718,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 +23745,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 +23770,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 +23932,6 @@ index a5796666d84d..0c8e7e07006f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -24011,10 +23941,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 +23968,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 +24117,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 +24149,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 +24170,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 +24195,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 +24356,6 @@ index c83031d5b506..384f284c4233 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -24447,10 +24365,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 +24392,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 +24417,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 +24579,6 @@ index 8809c7664f76..a35b27249321 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -24675,10 +24588,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 +24615,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 +24640,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 +24802,6 @@ index 09560bbaab54..864bbdfd7819 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -24903,10 +24811,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 +24838,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 +24863,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 +25009,6 @@ index e2e087a17fe3..43695342b267 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -25115,10 +25018,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 +25045,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 +25070,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 +25231,6 @@ index f2ec65de01cc..c2ee6bd9eb51 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -25342,10 +25240,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 +25267,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 +25293,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 +25404,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 +25425,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 +25435,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 +25574,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 +25606,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 +25627,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 +25810,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 +25858,6 @@ index 1c3cdc16241f..57ae8a9c5502 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -25986,10 +25868,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 +25903,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 +25919,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 +25937,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 +25962,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 +26123,6 @@ index 31757c2b89d3..ccbce8a93a86 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -26255,10 +26132,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 +26159,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 +26184,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 +26345,6 @@ index b6c5dc57c8fb..208fd6af96b7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -26482,10 +26354,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 +26381,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 +26408,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 +26553,6 @@ index f2ef55667bcb..665f9d57f8fa 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -26695,7 +26562,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 +26589,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 +26734,6 @@ index 2b5a1cf4ccbe..7b093b38218c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -26877,7 +26743,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 +26769,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 +26880,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 +26910,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 +26959,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 +27120,6 @@ index 699fdd026734..8c94cafaea8c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -27268,10 +27129,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 +27156,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 +27290,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 +27322,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 +27343,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 +27492,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 +27524,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 +27545,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 +27673,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 +27748,6 @@ index 328c77410ca2..6516aa36e738 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -27916,10 +27758,6 @@ index 328c77410ca2..6516aa36e738 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64": - - CXXFLAGS += [ @@ -27974,7 +27812,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 +27837,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 +27983,6 @@ index e65c7c572fc8..e684b91a0664 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -28155,10 +27992,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 +28019,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 +28176,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 +28222,6 @@ index 618af60da3be..bfb7cde7d729 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -28400,10 +28232,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 +28287,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 +28312,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 +28469,6 @@ index a767c9c76531..aaaed70ce9a2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -28651,10 +28478,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 +28505,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 +28639,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 +28671,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 +28692,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 +28717,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 +28867,6 @@ index 7aa4e9bfff47..ecc27ae7537e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -29061,10 +28876,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 +28903,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 +29037,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 +29069,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 +29104,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 +29129,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 +29286,6 @@ index f4f41e48ae54..5286d0893211 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -29492,10 +29295,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 +29322,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 +29347,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 +29504,6 @@ index 72e02793f70c..c9e2dbbd60a6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -29715,10 +29513,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 +29540,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 +29565,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 +29722,6 @@ index 6a37b25112a8..e03e19ffe137 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -29938,10 +29731,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 +29758,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 +29896,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 +29928,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 +29949,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 +29974,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 +30124,6 @@ index af4c0bf656d0..ccdfd183ece3 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -30352,10 +30133,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 +30160,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 +30185,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 +30342,6 @@ index abf04bb09f55..76f4e6aaf79d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -30575,10 +30351,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 +30378,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 +30403,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 +30564,6 @@ index b003d287bd3b..c36201f6936f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -30802,10 +30573,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 +30600,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 +30625,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 +30782,6 @@ index 264fc2cf4b44..ce50ff600882 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -31025,10 +30791,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 +30818,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 +30843,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 +31000,6 @@ index eb3342a9262b..554779329f71 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -31248,10 +31009,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 +31036,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 +31061,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 +31218,6 @@ index a6fa3b406360..0e5621e98050 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -31471,10 +31227,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 +31254,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 +31404,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 +31436,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 +31457,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 +31591,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 +31623,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 +31644,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 +31669,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 +31815,6 @@ index af4cd6b257f8..f824cfa02a97 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -32087,10 +31824,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 +31851,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 +31985,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 +32017,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 +32038,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 +32063,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 +32225,6 @@ index cfff6f34114e..a8cbb815b3dc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -32509,10 +32234,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 +32261,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 +32395,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 +32427,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 +32448,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 +32473,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 +32635,6 @@ index c09703ddd6a2..d923f1e5407f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -32931,10 +32644,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 +32671,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 +32805,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 +32837,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 +32858,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 +32992,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 +33024,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 +33045,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 +33070,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 +33227,6 @@ index 347559a342cb..b34d55194ffa 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -33542,10 +33236,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 +33263,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 +33288,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 +33449,6 @@ index 4dad1217d030..1beb494d070e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -33769,10 +33458,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 +33485,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 +33619,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 +33651,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 +33672,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 +33697,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 +33854,6 @@ index bbb1557baa57..07e4babacbee 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -34186,10 +33863,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 +33890,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 +33915,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 +34076,6 @@ index 75153f32214b..7e607a103229 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -34413,10 +34085,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 +34112,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 +34137,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 +34283,6 @@ index b9d3c55453a7..af6c05a7ac37 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -34625,10 +34292,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 +34319,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 +34344,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 +34505,6 @@ index 7d446965f130..2bc0c19c36ad 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -34852,10 +34514,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 +34541,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 +34566,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 +34727,6 @@ index aea0a80ed4fa..f37caf681b50 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -35079,10 +34736,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 +34763,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 +34788,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 +34934,6 @@ index 575478702e32..ca3e24ca4b66 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -35291,10 +34943,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 +34970,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 +34995,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 +35152,6 @@ index fa25fde0bd42..5ca4c8481054 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -35514,10 +35161,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 +35188,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 +35213,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 +35359,6 @@ index 4821c2bd8267..b91e6ceef362 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -35726,10 +35368,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 +35395,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 +35420,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 +35577,6 @@ index 0a56f32af0b5..1023ae364204 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -35949,10 +35586,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 +35613,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 +35638,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 +35799,6 @@ index 43d69c766282..a4630b7e5435 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -36176,10 +35808,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 +35835,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 +35860,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 +36021,6 @@ index c4b3b4cd1309..4a8e42c833db 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -36403,10 +36030,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 +36057,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 +36191,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 +36223,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 +36244,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 +36269,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 +36415,6 @@ index a5cc52279a9f..cab48c87fd99 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -36809,10 +36424,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 +36451,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 +36476,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 +36633,6 @@ index 78b7338ddd81..cac379b6b793 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -37032,10 +36642,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 +36669,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 +36694,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 +36855,6 @@ index 04dbb0327974..57d0a614a954 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -37259,10 +36864,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 +36891,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 +36916,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 +37062,6 @@ index 41f722069cde..929298145fe6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -37471,10 +37071,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 +37098,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 +37123,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 +37280,6 @@ index ed96e7c0f8b8..f2c0266976ea 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -37694,10 +37289,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 +37316,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 +37341,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 +37502,6 @@ index 479cf67a2a66..7f59f0ce2a61 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -37921,10 +37511,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 +37538,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 +37563,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 +37724,6 @@ index a8a6c576e22b..644ed46e25af 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -38148,10 +37733,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 +37760,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 +37788,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 +37945,6 @@ index 491f0cc543ac..2cdd2e8966cc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -38374,10 +37954,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 +37981,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 +38009,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 +38170,6 @@ index e2c57b99afb1..b9964a572e72 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -38604,10 +38179,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 +38206,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 +38234,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 +38391,6 @@ index 268854264f5b..75cf2ac66f90 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -38830,10 +38400,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 +38427,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 +38561,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 +38593,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 +38614,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 +38639,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 +38800,6 @@ index edfac56a3a52..76eea8d6f4b7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -39251,10 +38809,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 +38836,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 +38862,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 +39023,6 @@ index 7108d9fbe1c4..7e31717972c2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -39479,10 +39032,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 +39059,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 +39197,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 +39229,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 +39250,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 +39399,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 +39431,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 +39452,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 +39479,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 +39590,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 +39611,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 +39621,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 +39755,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 +39787,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 +39808,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 +39957,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 +39989,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 +40010,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 +40036,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 +40197,6 @@ index 7ad4cffedf28..0ef6f85dcfa2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -40690,10 +40206,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 +40233,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 +40371,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 +40403,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 +40424,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 +40562,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 +40594,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 +40615,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 +40753,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 +40785,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 +40806,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 +40944,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 +40976,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 +40997,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 +41142,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 +41174,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 +41195,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 +41220,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 +41377,6 @@ index 2966151ab6a6..29c503fd1b35 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -41910,10 +41386,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 +41413,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 +41438,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 +41595,6 @@ index 02b847ed761e..336b06122354 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -42133,10 +41604,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 +41631,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 +41814,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 +41853,6 @@ index 9ff36991fef8..4dec482b58ab 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -42396,10 +41862,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 +41873,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 +41915,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 +41941,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 +42102,6 @@ index f6f4442cfc84..0bf849711117 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -42650,10 +42111,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 +42138,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 +42272,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 +42304,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 +42325,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 +42350,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 +42511,6 @@ index 4e6e295d34a8..7780faadc89c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -43071,10 +42520,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 +42547,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 +42572,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 +42733,6 @@ index 64ffa7596019..6a905df4ed20 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -43298,10 +42742,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 +42769,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 +42795,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 +42956,6 @@ index 9473ac62f52b..2c59f64717cf 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -43526,10 +42965,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 +42992,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 +43017,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 +43167,6 @@ index c7a2f6d21536..c8a383c619f6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -43742,10 +43176,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 +43203,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 +43228,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 +43389,6 @@ index e70e3f68e936..8859fbd93187 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -43969,10 +43398,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 +43425,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 +43559,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 +43591,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 +43612,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 +43637,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 +43798,6 @@ index 4b0431db1a98..638f16d62cad 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -44390,10 +43807,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 +43834,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 +43860,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 +44021,6 @@ index 1b8da82f5817..0dc44f1fda4d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -44618,10 +44030,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 +44057,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 +44082,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 +44232,6 @@ index bea71dcee3e5..c8dc6b50f073 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -44834,10 +44241,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 +44268,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 +44402,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 +44434,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 +44455,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 +44481,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 +44642,6 @@ index f1a841d5aee9..ae8b8ea97657 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -45256,10 +44651,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 +44678,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 +44703,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 +44860,6 @@ index 40448f68a9d2..d92108c59272 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -45479,10 +44869,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 +44896,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 +44922,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 +45083,6 @@ index 9d4629e9abeb..2057bc49645f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -45707,10 +45092,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 +45119,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 +45144,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 +45305,6 @@ index 134ffac5fd31..a6688f3d2880 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -45934,10 +45314,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 +45341,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 +45490,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 +45522,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 +45543,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 +45568,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 +45729,6 @@ index dbb926c5fcb6..06b7c1408598 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -46370,10 +45738,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 +45765,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 +45790,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 +45951,6 @@ index 92da260f905a..23a0102c4071 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -46597,10 +45960,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 +45987,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 +46012,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 +46162,6 @@ index cedb17bc22b7..58600753bf59 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -46813,10 +46171,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 +46198,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 +46223,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 +46384,6 @@ index d45bc78ff6ae..76f782e606d1 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -47040,10 +46393,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 +46420,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 +46558,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 +46590,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 +46611,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 +46749,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 +46781,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 +46802,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 +46827,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 +46988,6 @@ index 2d8396fa2aa9..d120c6a00f95 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -47663,10 +46997,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 +47024,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 +47162,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 +47194,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 +47215,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 +47241,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 +47352,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 +47373,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 +47383,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 +47532,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 +47564,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 +47585,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 +47611,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 +47772,6 @@ index 6b8def8650b5..7a45c00e5966 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -48470,10 +47781,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 +47808,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 +47834,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 +47995,6 @@ index 8f2996fa264e..eee602cf0088 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -48698,10 +48004,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 +48031,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 +48056,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 +48217,6 @@ index 55cfbb60e71d..dbe8fdf62b34 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -48925,10 +48226,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 +48253,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 +48278,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 +48435,6 @@ index 7a02b7e10c3f..02a5a5977fb2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -49148,10 +48444,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 +48471,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 +48497,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 +48658,6 @@ index 992376cd8a35..7d069ced5f05 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -49376,10 +48667,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 +48694,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 +48720,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 +48881,6 @@ index 88031a747de7..07b14b4ad557 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -49604,10 +48890,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 +48917,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 +48942,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 +49099,6 @@ index 7e73b704838d..244e4b9f1e17 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -49827,10 +49108,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 +49135,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 +49273,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 +49305,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 +49326,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 +49352,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 +49513,6 @@ index 7dc22bcf2bdc..2d073c5534c0 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -50253,10 +49522,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 +49549,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 +49574,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 +49720,6 @@ index 6d174505ed03..a1efc9d29d6b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -50465,10 +49729,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 +49756,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 +49781,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 +49942,6 @@ index d80a3bb1c6d2..2d0cb60d35c2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -50692,10 +49951,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 +49978,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 +50004,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 +50165,6 @@ index d6d9d3658b8d..2309786d2b1c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -50920,10 +50174,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 +50201,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 +50226,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 +50387,6 @@ index 8769a3a31863..441defcc49c4 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -51147,10 +50396,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 +50423,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 +50449,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 +50610,6 @@ index 14595abaf908..eb8ba5a7bc73 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -51375,10 +50619,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 +50646,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 +50671,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 +50832,6 @@ index af79a781f6de..67ab6a2a8454 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -51602,10 +50841,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 +50868,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 +50893,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 +51043,6 @@ index 23f52652aebc..54810dea2903 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -51818,10 +51052,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 +51079,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 +51213,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 +51245,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 +51266,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 +51291,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 +51452,6 @@ index 31e0736f308e..21fd63ba8c66 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -52239,10 +51461,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 +51488,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 +51513,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 +51663,6 @@ index 52587c089017..a816267ba48b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -52455,10 +51672,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 +51699,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 +51724,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 +51874,6 @@ index 02813d2513b3..f5811a132b51 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -52671,10 +51883,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 +51910,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 +51935,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 +52085,6 @@ index 67c6a218f6db..c97c6e245e5c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -52887,10 +52094,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 +52121,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 +52146,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 +52296,6 @@ index 321370600559..c3d938676efc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -53103,10 +52305,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 +52332,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 +52357,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 +52518,6 @@ index 3739bbef8afc..951669e227b5 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -53330,10 +52527,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 +52554,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 +52579,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 +52741,6 @@ index b5bcafa45fbc..ca0e2eb0d4f3 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -53558,10 +52750,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 +52777,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 +52802,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 +52959,6 @@ index b48fc38c398c..7b699b35ae1c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -53781,10 +52968,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 +52995,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 +53020,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 +53182,6 @@ index 31d8c420f6b6..ef4afa64817b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -54009,10 +53191,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 +53218,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 +53243,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 +53404,6 @@ index e233806b437f..5d3384990b73 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -54236,10 +53413,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 +53440,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 +53465,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 +53627,6 @@ index 147a08113b86..e5abebc8e438 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -54464,10 +53636,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 +53663,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 +53688,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 +53838,6 @@ index 0ee8a34df8b9..bf9b47761a6b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -54680,10 +53847,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 +53874,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 +53899,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 +54056,6 @@ index 5931292efe33..92f384be816c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -54903,10 +54065,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 +54092,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 +54117,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 +54278,6 @@ index ca9f20ab87e6..3a63a38d3def 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -55130,10 +54287,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 +54314,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 +54339,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 +54496,6 @@ index 703c22a59092..e3ef5aa27c28 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -55353,10 +54505,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 +54532,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 +54557,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 +54714,6 @@ index 291502c95a37..d0ba53b314f1 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -55576,10 +54723,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 +54750,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 +54775,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 +54936,6 @@ index d83d51f98500..c2c328ca1180 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -55803,10 +54945,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 +54972,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 +54997,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 +55159,6 @@ index 7e8cb8782020..bb0f0dcf3f16 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -56031,10 +55168,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 +55195,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 +55220,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 +55381,6 @@ index 40ead5619cde..341ba2492f8d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -56258,10 +55390,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 +56476,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 +56610,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 +56642,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 +56663,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 +56797,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 +56829,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 +56850,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 +56984,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 +57016,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 +57037,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 +57062,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 +57212,6 @@ index a528123ae068..e46741806ee3 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -58115,10 +57221,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 +57248,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 +57273,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 +57435,6 @@ index 6b7f69865fd1..453c5e0ead44 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -58343,10 +57444,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 +57525,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 +57550,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 +57711,6 @@ index 2876755e9119..54de56dcae4e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -58624,10 +57720,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 +57747,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 +57772,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 +57918,6 @@ index 88f2cb22e03b..8a8bd3e82b3a 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -58836,10 +57927,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 +57954,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 +57979,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 +58140,6 @@ index da304ae5a4f9..6a99f50c5c90 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -59063,10 +58149,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 +58176,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 +58201,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 +58363,6 @@ index 382194837b7f..b9118e1215cd 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -59291,10 +58372,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 +58399,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 +58424,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 +58581,6 @@ index 2c8b5e232175..172b2829c241 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -59514,10 +58590,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 +58617,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 +58642,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 +58788,6 @@ index d2e3ea012808..393d9c9b7322 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -59726,10 +58797,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 +58824,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 +58849,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 +58995,6 @@ index aa7a21a68032..76439cf53388 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -59938,10 +59004,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 +59031,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 +59056,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 +59202,6 @@ index 41a8c05baecd..169ba1ccf906 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -60150,10 +59211,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 +59238,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 +59380,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 +59416,6 @@ index b6921b76262e..dda03191e506 100644 - ] - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -60369,10 +59425,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 +59443,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 +59634,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 +59695,6 @@ index 24988a1ffc06..a2ba3c8ac944 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -60653,10 +59704,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 +59714,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 +59726,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 +59743,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 +59756,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 +59766,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 +59791,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 +59953,6 @@ index 49c62d5cf608..30fbc8a16f91 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -60916,10 +59962,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 +59989,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 +60014,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 +60171,6 @@ index dd8e979e41fe..3c56145fb1aa 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -61139,10 +60180,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 +60207,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 +60345,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 +60377,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 +60398,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 +60423,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 +60580,6 @@ index e67bb6616d49..100155a39f1f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -61560,10 +60589,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 +60616,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 +60641,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 +60802,6 @@ index 9b8e33b7d542..5a661787308d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -61787,10 +60811,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 +60838,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 +60863,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 +61020,6 @@ index 487fc5b4d6e5..97d7596cd7ee 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -62010,10 +61029,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 +61056,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 +61081,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 +61238,6 @@ index dd901a5371a0..99867a1c8f90 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -62233,10 +61247,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 +61274,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 +61299,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 +61460,6 @@ index 0f6654f1ab6f..309d2686d921 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -62460,10 +61469,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 +61496,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 +61521,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 +61682,6 @@ index f3f85aacaa19..c1be9596e0a5 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -62687,10 +61691,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 +61718,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 +61743,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 +61900,6 @@ index 8a1dfd6377d5..c4b6ec469538 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -62910,10 +61909,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 +61936,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 +61961,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 +62118,6 @@ index a3ea8b349573..bb66a11cb47c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -63133,10 +62127,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 +62154,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 +62179,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 +62329,6 @@ index a285154a79ed..9fad4e4a38d8 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -63349,10 +62338,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 +62365,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 +62390,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 +62547,6 @@ index 412f719d18cd..415872506d13 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -63572,10 +62556,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 +62583,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 +62608,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 +62758,6 @@ index 36867642c7ba..81060f6b3f2c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -63788,10 +62767,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 +62794,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 +62819,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 +62969,6 @@ index caf0efc16596..463feb1bc7a7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -64004,10 +62978,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 +63005,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 +63030,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 +63180,6 @@ index 8c6e826a4a85..284a46af8e7d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -64220,10 +63189,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 +63216,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 +63241,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 +63402,6 @@ index c7ca3c7fd85f..c38cf361ccf6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -64447,10 +63411,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 +63438,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 +63463,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 +63613,6 @@ index f3993a17b1c2..13ea6d3315e7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -64663,10 +63622,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 +63649,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 +63674,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 +63824,6 @@ index ad8a6874e406..59227c6d26ab 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -64879,10 +63833,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 +63860,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 +63885,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 +64046,6 @@ index 60cc81a2292b..40909203b3cf 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -65106,10 +64055,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 +64082,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 +64107,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 +64264,6 @@ index b14bef2dec4f..fae7dffcca41 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -65329,10 +64273,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 +64300,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 +64325,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 +64487,6 @@ index 5af51f1238a8..48e566809b99 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -65557,10 +64496,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 +64523,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 +64548,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 +64710,6 @@ index d42eb284cd9a..c914dfcbd7b5 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -65785,10 +64719,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 +64746,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 +64771,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 +64921,6 @@ index 81c9b9d4043c..e49d55137a91 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -66001,10 +64930,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 +64957,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 +64982,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 +65144,6 @@ index 82a4d24e97a9..7fbbf3bb99f1 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -66229,10 +65153,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 +65180,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 +65205,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 +65355,6 @@ index 6799224dff30..b382aa7a36f5 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -66445,10 +65364,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 +65391,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 +65416,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 +65578,6 @@ index 2423950ba511..9886a43a6d6c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -66673,10 +65587,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 +65614,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 +65639,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 +65801,6 @@ index 5bb64f341208..0eba1201fe1f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -66901,10 +65810,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 +65837,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 +65862,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 +66024,6 @@ index 6f1575870ead..caec155ca861 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -67129,10 +66033,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 +66060,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 59472bdc9b56..45b99de39516 100644 --- third_party/libwebrtc/moz.build +++ third_party/libwebrtc/moz.build -@@ -263,6 +263,8 @@ DIRS += [ +@@ -266,6 +266,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 +66072,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 += [ +@@ -465,102 +467,11 @@ DIRS += [ "/third_party/libwebrtc/webrtc_gn" ] @@ -67276,7 +66176,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": +@@ -568,26 +479,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" ] @@ -67304,7 +66204,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": +@@ -595,11 +489,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32": "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" ] @@ -67317,7 +66217,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": +@@ -607,7 +499,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64": "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" ] @@ -67326,7 +66226,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": +@@ -615,8 +507,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 +66235,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": +@@ -624,7 +514,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" ] @@ -67344,7 +66244,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": +@@ -632,69 +522,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 +66315,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 +66340,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 +66498,6 @@ index 866c7aec5add..334fc3e241bd 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -67608,10 +66507,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 +66534,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 +66668,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 +66700,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 +66720,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 +66746,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 +66903,6 @@ index 62b75c06ce21..6a1b5eae3ba5 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -68249,10 +66912,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 +66939,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 +66964,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 +67114,6 @@ index a4a4e8c6e42a..94d68859a601 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -68465,10 +67123,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 +67150,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 +67175,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 +67332,6 @@ index 8836b1e08940..0456682b1478 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -68688,10 +67341,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 +67368,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 +67393,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 +67543,6 @@ index b6a5de1971d5..63a6ddbeeec1 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -68904,10 +67552,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 +67579,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 +67717,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 +67749,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 +67770,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 +67795,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 +67945,6 @@ index b093b72f1f14..3105ccac7dc2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -69318,10 +67954,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 +67981,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 +68115,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 +68147,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 +68168,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 +68193,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 +68343,6 @@ index f2ef2e2a78ef..7b90d3cec001 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -69728,10 +68352,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 +68379,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 +68513,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 +68545,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 +68566,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 +68591,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 +68741,6 @@ index 8fd59a6ce285..f8a255e5bd46 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -70138,10 +68750,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 +68777,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 +68915,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 +68947,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 +68968,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 +69106,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 +69138,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 +69159,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 +69184,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 +69334,6 @@ index f026e25abd0b..89d6eded82d3 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -70750,10 +69343,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 +69370,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 +69395,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 +69545,6 @@ index 4aa1aa43535a..339e21e75364 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -70966,10 +69554,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 +69581,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 +69719,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 +69751,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 +69772,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 +69906,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 +69938,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 +69959,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 +69984,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 +70141,6 @@ index 06daf6b03a02..f402ae850f31 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -71581,10 +70150,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 +70177,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 +70202,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 +70359,6 @@ index 4435f010b6bd..9cc536965c58 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -71804,10 +70368,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 +70395,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 +70420,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 +70577,6 @@ index cbbb32ab7072..15521be543f6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -72027,10 +70586,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 +70613,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 +70638,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 +70795,6 @@ index 95a92d20e182..eedfd17761b3 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -72250,10 +70804,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 +70831,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 +70856,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 +71013,6 @@ index 5151c986c4b8..17833ef180df 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -72473,10 +71022,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 +71049,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 +71074,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 +71231,6 @@ index b7a699fe03d0..5b8291b5a0f8 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -72696,10 +71240,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 +71267,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 +71292,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 +71449,6 @@ index ea63aafc99e4..6f561f98057c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -72919,10 +71458,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 +71485,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 +71510,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 +71667,6 @@ index 3857bc9451e5..e4dbcc26dabc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -73142,10 +71676,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 +71703,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 +71728,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 +71885,6 @@ index 5f811a6c6da4..0354b3c70d5e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -73365,10 +71894,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 +71921,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 +71946,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 +72103,6 @@ index 68ad8a0f1413..a6c29e1fb3af 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -73588,10 +72112,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 +72139,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 +72164,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 +72321,6 @@ index c4b1f5bc22c7..222b58931e96 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -73811,10 +72330,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 +72357,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 +72382,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 +72539,6 @@ index 298ca9297c50..916a31d69ac4 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -74034,10 +72548,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 +72575,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 +72600,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 +72757,6 @@ index d606a38148ca..f2d347a7f2ec 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -74257,10 +72766,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 +72793,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 +72818,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 +72975,6 @@ index be85251358d7..23c2a12352e5 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -74480,10 +72984,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 +73011,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 +73036,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 +73193,6 @@ index 7229d639e8a4..7fad9c144446 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -74703,10 +73202,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 +73229,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 +73254,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 +73411,6 @@ index d031f8ace4be..837697bbafe8 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -74926,10 +73420,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 +73447,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 +73472,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 +73629,6 @@ index 30c52de72463..249d52d48465 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -75149,10 +73638,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 +73665,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 +73799,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 +73831,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 +73852,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 +73877,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 +74027,6 @@ index ee30758d89d1..30634ecae00b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -75559,10 +74036,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 +74064,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 +74147,6 @@ index 7985a5f7feba..000000000000 - DEFINES["WEBRTC_HAS_NEON"] = True - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -75686,17 +74158,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 +74298,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 +74330,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 +74351,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 +74376,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 +74533,6 @@ index a893dab3c2e5..7377b5d7b0fe 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -76082,10 +74542,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 +74569,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 +74595,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 +74752,6 @@ index 02f74cddfac6..59bf7125a288 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -76306,10 +74761,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 +74788,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 +74922,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 +74954,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 +74975,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 +75000,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 +75150,6 @@ index f5720480dd0c..32bf460aab31 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -76716,10 +75159,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 +75186,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 +75324,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 +75356,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 +75377,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 +75515,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 +75547,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 +75568,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 +75593,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 +75750,6 @@ index c036110d1a92..f9f2ab464a09 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -77335,10 +75759,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 +75786,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 +75811,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 +75957,6 @@ index a1276d9a7a78..e33a367c88f7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -77547,10 +75966,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 +75993,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 +76018,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 +76168,6 @@ index 083e18ac8eb2..2728e4fc1e0e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -77763,10 +76177,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 +76204,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 +76229,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 +76379,6 @@ index c35c498d443d..907f5af871eb 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -77979,10 +76388,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 +76415,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 +76440,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 +76598,6 @@ index 7385764373a0..22553cd1b0bf 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -78203,10 +76607,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 +76634,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 +76772,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 +76804,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 +76825,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 +76850,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 +77007,6 @@ index 6e962e328066..83c2d573d1d9 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -78624,10 +77016,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 +77043,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 +77068,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 +77218,6 @@ index 0e817e6eb986..9059a39f8aac 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -78840,10 +77227,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 +77254,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 +77388,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 +77420,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 +77441,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 +77466,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 +77616,6 @@ index 2fab6231568d..bdd70e6e3d8b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -79250,10 +77625,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 +77652,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 +77677,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 +77827,6 @@ index 394eefde596a..c0bea1606f76 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -79466,10 +77836,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 +77863,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 +77888,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 +78049,6 @@ index cf10767d72d0..3b3fba53974d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -79693,10 +78058,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 +78085,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 +78110,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 +78267,6 @@ index 657f0a65979a..62e2c13f1f01 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -79916,10 +78276,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 +78303,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 +78328,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 +78485,6 @@ index f8ebf228f169..6396cbeff915 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -80139,10 +78494,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 +78521,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 +78655,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 +78687,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 +78708,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 +78846,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 +78878,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 +78899,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 +78924,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 +79081,6 @@ index a3bb657070e1..48c882b1fbad 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -80754,10 +79090,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 +79117,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 +79142,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 +79292,6 @@ index 1c0d84013b28..5c7773f371b8 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -80970,10 +79301,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 +79328,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 +79353,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 +79503,6 @@ index 21635e570bc3..a0e7ee73dc4b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -81186,10 +79512,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 +79539,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 +79673,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 +79705,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 +79726,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 +79864,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 +79896,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 +79917,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 +80055,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 +80087,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 +80108,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 +80133,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 +80283,6 @@ index 99c6eb8f5374..22bf6f11a0ed 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -81992,10 +80292,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 +80319,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 +80453,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 +80485,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 +80506,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 +80531,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 +80689,6 @@ index 86ef2dc1a70b..15d61fd11419 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -82410,10 +80698,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 +80725,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 +80871,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 +80903,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 +80924,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 +80949,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 +81107,6 @@ index 0d1760a15cac..a3866ef3ba39 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -82840,10 +81116,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 +81143,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 +81289,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 +81321,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 +81342,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 +81476,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 +81508,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 +81529,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 +81554,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 +81704,6 @@ index 58008d114a2b..9576a81b9996 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -83456,10 +81713,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 +81740,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 +81878,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 +81910,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 +81931,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 +82069,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 +82101,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 +82122,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 +82147,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 +82297,6 @@ index a43e97a8c23c..4d146c5058d6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -84068,10 +82306,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 +82333,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 +82358,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 +82504,6 @@ index ac962ac0a281..9649e4f55e8e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -84280,10 +82513,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 +82540,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 +82565,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 +82715,6 @@ index 7adceec9b45a..a11e7ba0278c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -84496,10 +82724,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 +82751,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 +82885,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 +82917,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 +82939,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 +83004,6 @@ index b99d782d883b..000000000000 - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -84881,7 +83097,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 +83122,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 +83272,6 @@ index 6d0a52310337..f1f0224d6a0f 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -85066,10 +83281,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 +83381,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 +83515,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 +83547,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 +83568,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 +83702,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 +83734,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 +83755,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 +83889,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 +83921,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 +83942,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 +84076,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 +84108,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 +84129,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 +84263,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 +84295,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 +84316,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 +84450,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 +84482,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 +84503,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 +84528,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 +84689,6 @@ index 224f77682849..fc5427430c09 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -86530,10 +84698,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 +84725,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 +84750,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 +84900,6 @@ index 0d35da2f19ba..6a868ab4ba72 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -86746,10 +84909,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 +84936,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 +84961,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 +85107,6 @@ index 906a4a9e8155..2005c1b47194 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -86958,10 +85116,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 +85143,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 +85168,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 +85326,6 @@ index 199af4b1d30e..71991469ebe2 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -87182,10 +85335,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 +85362,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 +85388,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 +85545,6 @@ index c4eb7ac8de41..29f5854612cb 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -87406,10 +85554,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 +85581,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 +85715,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 +85747,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 +85768,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 +85902,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 +85934,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 +85955,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 +86093,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 +86125,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 +86146,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 +86171,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 +86321,6 @@ index a7cf9dd19e0f..6cb2d2ab092b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -88208,10 +86330,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 +86819,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 +86844,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 +86994,6 @@ index 1029a25252bc..0eae58b028b7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -88886,10 +87003,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 +87351,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 +87376,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 +87526,6 @@ index 5a007d6343e2..e58095f60b94 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -89423,10 +87535,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 +87562,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 +87587,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 +87744,6 @@ index e23512e42579..5b24ada78a23 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -89646,10 +87753,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 +87780,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 +87805,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 +87955,6 @@ index aa35ad0401a8..1da178fc929e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -89862,10 +87964,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 +87991,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 +88016,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 +88187,6 @@ index e53ea6babd3d..df52edb77169 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -90099,10 +88196,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 +88223,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 +88373,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 +88405,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 +88426,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 +88441,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 +88518,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 +88540,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 +88561,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 +88576,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 +88653,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 +88675,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 +88696,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 +88711,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 +88788,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 +88810,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 +88831,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 +88846,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 +88923,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 +88945,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 +88966,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 +88981,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 +89058,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 +89080,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 +89101,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 +89116,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 +89193,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 +89215,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 +89236,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 +89251,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 +89338,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 +89355,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 +89375,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 +89404,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 +89481,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 +89503,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 +89524,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 +89539,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 +89626,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 +89643,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 +89663,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 +89692,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 +89779,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 +89796,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 +89816,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 +89845,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 +89922,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 +89944,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 +89965,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 +89980,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 +90057,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 +90079,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 +90100,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 +90115,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 +90192,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 +90214,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 +90235,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 +90250,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 +90327,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 +90349,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 +90370,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 +90385,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 +90462,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 +90484,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 +90505,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 +90520,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 +90597,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 +90619,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 +90640,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 +90655,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 +90732,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 +90754,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 +90775,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 +90790,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 +90867,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 +90889,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 +90910,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 +90925,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 +91002,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 +91024,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 +91045,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 +91060,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 +91137,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 +91159,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 +91180,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 +91195,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 +91282,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 +91299,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 +91319,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 +91348,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 +91435,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 +91452,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 +91472,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 +91501,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 +91588,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 +91605,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 +91625,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 +91654,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 +91741,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 +91758,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 +91778,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 +91807,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 +91894,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 +91911,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 +91931,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 +91960,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 +92037,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 +92059,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 +92080,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 +92095,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 +92172,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 +92194,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 +92215,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 +92230,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 +92307,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 +92329,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 +92350,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 +92365,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 +92442,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 +92464,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 +92632,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 +92766,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 +92798,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 +92819,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 +92926,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 +92957,6 @@ index ee4fd18a3eb4..e3c3b4dc2ce0 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -95076,10 +92967,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 +93041,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 +93059,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 +93148,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 +93169,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 +93189,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 +93228,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 +93390,6 @@ index 2d1fd69ed05d..ee1b5000f55a 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -95518,10 +93399,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 +93426,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 +93451,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 +93608,6 @@ index 1c2c9ef83579..f417c976fc09 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -95741,10 +93617,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 +93644,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 +93669,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 +93831,6 @@ index e2d2f9963d84..bf53b31dbe77 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -95969,10 +93840,6 @@ index e2d2f9963d84..bf53b31dbe77 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -96000,7 +93867,7 @@ index e2d2f9963d84..bf53b31dbe77 100644 Library("streams_config_gn") diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build -index d0e4adeda239..c30a81d15c5e 100644 +index 0aff4a854c57..c30a81d15c5e 100644 --- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build +++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -96025,7 +93892,7 @@ index d0e4adeda239..c30a81d15c5e 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" @@ -96186,7 +94053,6 @@ index d0e4adeda239..c30a81d15c5e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -96196,10 +94062,6 @@ index d0e4adeda239..c30a81d15c5e 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -96227,7 +94089,7 @@ index d0e4adeda239..c30a81d15c5e 100644 Library("decode_synchronizer_gn") diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build -index 51ec86b2cf18..be8a118afa55 100644 +index a860d550ad87..be8a118afa55 100644 --- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build +++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -96252,7 +94114,7 @@ index 51ec86b2cf18..be8a118afa55 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" @@ -96413,7 +94275,6 @@ index 51ec86b2cf18..be8a118afa55 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -96423,10 +94284,6 @@ index 51ec86b2cf18..be8a118afa55 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -96454,7 +94311,7 @@ index 51ec86b2cf18..be8a118afa55 100644 Library("frame_cadence_adapter_gn") diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build -index a53fde81f207..748c6fbb6acf 100644 +index d3fb5a47101a..748c6fbb6acf 100644 --- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build +++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -96603,7 +94460,7 @@ index a53fde81f207..748c6fbb6acf 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 @@ -96635,16 +94492,9 @@ index a53fde81f207..748c6fbb6acf 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 @@ -96663,7 +94513,7 @@ index a53fde81f207..748c6fbb6acf 100644 - Library("frame_decode_scheduler_gn") diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build -index ca09fac23b1d..bf76b80dce48 100644 +index 9161f27d718e..bf76b80dce48 100644 --- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build +++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -96688,7 +94538,7 @@ index ca09fac23b1d..bf76b80dce48 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" @@ -96849,7 +94699,6 @@ index ca09fac23b1d..bf76b80dce48 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -96859,10 +94708,6 @@ index ca09fac23b1d..bf76b80dce48 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -96890,7 +94735,7 @@ index ca09fac23b1d..bf76b80dce48 100644 Library("frame_decode_timing_gn") diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -index 39e9878bd229..080bbd8999f7 100644 +index 309c0b159e13..080bbd8999f7 100644 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -96915,7 +94760,7 @@ index 39e9878bd229..080bbd8999f7 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" @@ -97077,7 +94922,6 @@ index 39e9878bd229..080bbd8999f7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -97087,10 +94931,6 @@ index 39e9878bd229..080bbd8999f7 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -97118,7 +94958,7 @@ index 39e9878bd229..080bbd8999f7 100644 Library("frame_dumping_decoder_gn") diff --git third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build -index 615033eb1d1c..18b7d57c46ae 100644 +index 6719245825f8..18b7d57c46ae 100644 --- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build +++ third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -97143,7 +94983,7 @@ index 615033eb1d1c..18b7d57c46ae 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" @@ -97305,7 +95145,6 @@ index 615033eb1d1c..18b7d57c46ae 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -97315,10 +95154,6 @@ index 615033eb1d1c..18b7d57c46ae 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -97346,7 +95181,7 @@ index 615033eb1d1c..18b7d57c46ae 100644 Library("frame_dumping_encoder_gn") diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build -index ad1d7fbfb348..bb86b6904a1e 100644 +index 36d087a36ad9..bb86b6904a1e 100644 --- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build +++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -97371,7 +95206,7 @@ index ad1d7fbfb348..bb86b6904a1e 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" @@ -97528,7 +95363,6 @@ index ad1d7fbfb348..bb86b6904a1e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -97538,10 +95372,6 @@ index ad1d7fbfb348..bb86b6904a1e 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -97569,7 +95399,7 @@ index ad1d7fbfb348..bb86b6904a1e 100644 Library("incoming_video_stream_gn") diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build -index d5de8cd1781e..c959f629c28c 100644 +index b0b4923e3415..c959f629c28c 100644 --- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build +++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -97594,7 +95424,7 @@ index d5de8cd1781e..c959f629c28c 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" @@ -97751,7 +95581,6 @@ index d5de8cd1781e..c959f629c28c 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -97761,10 +95590,6 @@ index d5de8cd1781e..c959f629c28c 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -97792,7 +95617,7 @@ index d5de8cd1781e..c959f629c28c 100644 Library("video_render_frames_gn") diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build -index 2651f290bc5b..72717c771efc 100644 +index 302f8420c940..72717c771efc 100644 --- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build +++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -97817,7 +95642,7 @@ index 2651f290bc5b..72717c771efc 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" @@ -97978,7 +95803,6 @@ index 2651f290bc5b..72717c771efc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -97988,10 +95812,6 @@ index 2651f290bc5b..72717c771efc 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -98019,7 +95839,7 @@ index 2651f290bc5b..72717c771efc 100644 Library("task_queue_frame_decode_scheduler_gn") diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build -index 24b3c5a30b6e..0d30b9bd4787 100644 +index e38fabc4cc62..0d30b9bd4787 100644 --- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build +++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -98044,7 +95864,7 @@ index 24b3c5a30b6e..0d30b9bd4787 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" @@ -98190,7 +96010,6 @@ index 24b3c5a30b6e..0d30b9bd4787 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -98200,10 +96019,6 @@ index 24b3c5a30b6e..0d30b9bd4787 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -98231,7 +96046,7 @@ index 24b3c5a30b6e..0d30b9bd4787 100644 Library("unique_timestamp_counter_gn") diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build -index e8ac15dc40e6..a7091e452af6 100644 +index 1106f274c25d..fb1f9c3097d2 100644 --- third_party/libwebrtc/video/video_gn/moz.build +++ third_party/libwebrtc/video/video_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -98256,7 +96071,7 @@ index e8ac15dc40e6..a7091e452af6 100644 FINAL_LIBRARY = "webrtc" -@@ -63,195 +73,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -62,190 +72,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -98418,7 +96233,6 @@ index e8ac15dc40e6..a7091e452af6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -98428,10 +96242,6 @@ index e8ac15dc40e6..a7091e452af6 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -98459,7 +96269,7 @@ index e8ac15dc40e6..a7091e452af6 100644 Library("video_gn") diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build -index 8fb9a9c73712..bd076121f04b 100644 +index f7e5be24c0e5..bd076121f04b 100644 --- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build +++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -98484,7 +96294,7 @@ index 8fb9a9c73712..bd076121f04b 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" @@ -98645,7 +96455,6 @@ index 8fb9a9c73712..bd076121f04b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -98655,10 +96464,6 @@ index 8fb9a9c73712..bd076121f04b 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -98686,7 +96491,7 @@ index 8fb9a9c73712..bd076121f04b 100644 Library("video_receive_stream_timeout_tracker_gn") diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build -index e60151d9678e..d3d87dd6dc37 100644 +index 7da76222b17f..d3d87dd6dc37 100644 --- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build +++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -98711,7 +96516,7 @@ index e60151d9678e..d3d87dd6dc37 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" @@ -98873,7 +96678,6 @@ index e60151d9678e..d3d87dd6dc37 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -98883,10 +96687,6 @@ index e60151d9678e..d3d87dd6dc37 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -98914,7 +96714,7 @@ index e60151d9678e..d3d87dd6dc37 100644 Library("video_stream_buffer_controller_gn") diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build -index 2ea2fce60b58..ebcf5af12e54 100644 +index af4e29ee0a0e..ebcf5af12e54 100644 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -98939,7 +96739,7 @@ index 2ea2fce60b58..ebcf5af12e54 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" @@ -99101,7 +96901,6 @@ index 2ea2fce60b58..ebcf5af12e54 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -99111,10 +96910,6 @@ index 2ea2fce60b58..ebcf5af12e54 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -99142,7 +96937,7 @@ index 2ea2fce60b58..ebcf5af12e54 100644 Library("video_stream_encoder_impl_gn") diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build -index 0d40ef9c8f22..82e65469d09c 100644 +index beeb7f91175e..82e65469d09c 100644 --- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build +++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -99287,7 +97082,7 @@ index 0d40ef9c8f22..82e65469d09c 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 @@ -99319,16 +97114,9 @@ index 0d40ef9c8f22..82e65469d09c 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 @@ -99347,7 +97135,7 @@ index 0d40ef9c8f22..82e65469d09c 100644 - Library("video_stream_encoder_interface_gn") diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build -index f71e5851253d..4b3dba6c6883 100644 +index b327aad03049..4b3dba6c6883 100644 --- third_party/libwebrtc/webrtc_gn/moz.build +++ third_party/libwebrtc/webrtc_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -99572,23 +97360,16 @@ index f71e5851253d..4b3dba6c6883 100644 DEFINES["USE_X11"] = "1" -@@ -232,53 +111,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +@@ -232,46 +111,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": "Xrender" ] -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["WEBRTC_USE_PIPEWIRE"] = True diff --git a/www/librewolf/files/patch-rust-1.78.0 b/www/librewolf/files/patch-rust-1.78.0 deleted file mode 100644 index 5c34337cb7a6..000000000000 --- a/www/librewolf/files/patch-rust-1.78.0 +++ /dev/null @@ -1,3542 +0,0 @@ - -# HG changeset patch -# User Henri Sivonen <hsivonen@hsivonen.fi> -# Date 1714462184 0 -# Node ID 1db2ef126a6a8555dbf50345e16492c977b42e92 -# Parent a545e84b3674c4878f2e618b7bce23058f2ac690 -Bug 1882209 - Update encoding_rs to 0.8.34 to deal with rustc changes. r=glandium,supply-chain-reviewers - -Differential Revision: https://phabricator.services.mozilla.com/D207167 - -diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in ---- .cargo/config.in -+++ .cargo/config.in -@@ -40,6 +40,11 @@ replace-with = "vendored-sources" - rev = "9a2ef335c366044ffe73b1c4acabe50a1daefe05" - replace-with = "vendored-sources" - -+[source."git+https://github.com/hsivonen/any_all_workaround?rev=7fb1b7034c9f172aade21ee1c8554e8d8a48af80"] -+git = "https://github.com/hsivonen/any_all_workaround" -+rev = "7fb1b7034c9f172aade21ee1c8554e8d8a48af80" -+replace-with = "vendored-sources" -+ - [source."git+https://github.com/hsivonen/chardetng?rev=3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"] - git = "https://github.com/hsivonen/chardetng" - rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" -diff --git a/Cargo.lock b/Cargo.lock ---- Cargo.lock -+++ Cargo.lock -@@ -87,16 +87,25 @@ dependencies = [ - - [[package]] - name = "anstyle" - version = "1.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" - - [[package]] -+name = "any_all_workaround" -+version = "0.1.0" -+source = "git+https://github.com/hsivonen/any_all_workaround?rev=7fb1b7034c9f172aade21ee1c8554e8d8a48af80#7fb1b7034c9f172aade21ee1c8554e8d8a48af80" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "version_check", -+] -+ -+[[package]] - name = "anyhow" - version = "1.0.69" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" - - [[package]] - name = "app_services_logger" - version = "0.1.0" -@@ -1571,22 +1580,22 @@ dependencies = [ - "encoding_rs", - "nserror", - "nsstring", - "xmldecl", - ] - - [[package]] - name = "encoding_rs" --version = "0.8.33" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" --dependencies = [ -+version = "0.8.34" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -+dependencies = [ -+ "any_all_workaround", - "cfg-if 1.0.0", -- "packed_simd", - ] - - [[package]] - name = "enum-map" - version = "2.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" - dependencies = [ -@@ -4321,26 +4330,16 @@ checksum = "8d91edf4fbb970279443471345a4 - name = "oxilangtag-ffi" - version = "0.1.0" - dependencies = [ - "nsstring", - "oxilangtag", - ] - - [[package]] --name = "packed_simd" --version = "0.3.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d" --dependencies = [ -- "cfg-if 1.0.0", -- "num-traits", --] -- --[[package]] - name = "parking_lot" - version = "0.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" - dependencies = [ - "lock_api", - "parking_lot_core", - ] -diff --git a/Cargo.toml b/Cargo.toml ---- Cargo.toml -+++ Cargo.toml -@@ -190,6 +190,7 @@ cssparser-macros = { git = "https://github.com/servo/r - cssparser-macros = { git = "https://github.com/servo/rust-cssparser", rev = "aaa966d9d6ae70c4b8a62bb5e3a14c068bb7dff0" } - - # Other overrides -+any_all_workaround = { git = "https://github.com/hsivonen/any_all_workaround", rev = "7fb1b7034c9f172aade21ee1c8554e8d8a48af80" } - chardetng = { git = "https://github.com/hsivonen/chardetng", rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } - chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } - coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83" } -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk ---- config/makefiles/rust.mk -+++ config/makefiles/rust.mk -@@ -260,17 +260,17 @@ export COREAUDIO_SDK_PATH=$(IPHONEOS_SDK - export IPHONEOS_SDK_DIR - PATH := $(topsrcdir)/build/macosx:$(PATH) - endif - endif - - ifndef RUSTC_BOOTSTRAP - RUSTC_BOOTSTRAP := mozglue_static,qcms - ifdef MOZ_RUST_SIMD --RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd -+RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,any_all_workaround - endif - export RUSTC_BOOTSTRAP - endif - - target_rust_ltoable := force-cargo-library-build $(ADD_RUST_LTOABLE) - target_rust_nonltoable := force-cargo-test-run force-cargo-program-build - - ifdef MOZ_PGO_RUST -diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml ---- supply-chain/audits.toml -+++ supply-chain/audits.toml -@@ -596,16 +596,29 @@ who = "Mike Hommey <mh+mozilla@glandium. - criteria = "safe-to-deploy" - delta = "0.1.2 -> 0.1.4" - - [[audits.android_system_properties]] - who = "Mike Hommey <mh+mozilla@glandium.org>" - criteria = "safe-to-deploy" - delta = "0.1.4 -> 0.1.5" - -+[[audits.any_all_workaround]] -+who = "Henri Sivonen <hsivonen@hsivonen.fi>" -+criteria = "safe-to-deploy" -+version = "0.1.0" -+notes = "The little code that is in this crate I reviewed and modified from packed_simd (which has previously been vendored in full instead of just this small part)." -+ -+[[audits.any_all_workaround]] -+who = "Henri Sivonen <hsivonen@hsivonen.fi>" -+criteria = "safe-to-deploy" -+delta = "0.1.0 -> 0.1.0@git:7fb1b7034c9f172aade21ee1c8554e8d8a48af80" -+importable = false -+notes = "This is a trivial workaround copied from elsewhere in m-c, specifically qcms." -+ - [[audits.anyhow]] - who = "Mike Hommey <mh+mozilla@glandium.org>" - criteria = "safe-to-deploy" - delta = "1.0.57 -> 1.0.61" - - [[audits.anyhow]] - who = "Bobby Holley <bobbyholley@gmail.com>" - criteria = "safe-to-deploy" -diff --git a/supply-chain/config.toml b/supply-chain/config.toml ---- supply-chain/config.toml -+++ supply-chain/config.toml -@@ -14,16 +14,20 @@ url = "https://raw.githubusercontent.com - url = "https://raw.githubusercontent.com/google/supply-chain/main/audits.toml" - - [imports.isrg] - url = "https://raw.githubusercontent.com/divviup/libprio-rs/main/supply-chain/audits.toml" - - [imports.mozilla] - url = "https://raw.githubusercontent.com/mozilla/supply-chain/main/audits.toml" - -+[policy.any_all_workaround] -+audit-as-crates-io = true -+notes = "This is the upstream code plus the ARM intrinsics workaround from qcms, see bug 1882209." -+ - [policy.autocfg] - audit-as-crates-io = true - notes = "This is the upstream code plus a few local fixes, see bug 1685697." - - [policy.chardetng] - audit-as-crates-io = true - notes = "This is a crate Henri wrote which is also published. We should probably update Firefox to tip and certify that." - -diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock ---- supply-chain/imports.lock -+++ supply-chain/imports.lock -@@ -192,16 +192,23 @@ user-name = "David Tolnay" - - [[publisher.encoding_rs]] - version = "0.8.33" - when = "2023-08-23" - user-id = 4484 - user-login = "hsivonen" - user-name = "Henri Sivonen" - -+[[publisher.encoding_rs]] -+version = "0.8.34" -+when = "2024-04-10" -+user-id = 4484 -+user-login = "hsivonen" -+user-name = "Henri Sivonen" -+ - [[publisher.errno]] - version = "0.3.8" - when = "2023-11-28" - user-id = 6825 - user-login = "sunfishcode" - user-name = "Dan Gohman" - - [[publisher.etagere]] -diff --git a/third_party/rust/any_all_workaround/.cargo-checksum.json b/third_party/rust/any_all_workaround/.cargo-checksum.json -new file mode 100644 ---- /dev/null -+++ third_party/rust/any_all_workaround/.cargo-checksum.json -@@ -0,0 +1,1 @@ -+{"files":{"Cargo.toml":"f8c127449dc9432d404c21c99833e4617ab88a797445af249a7fe3c989985d6d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","LICENSE-MIT-QCMS":"36d847ae882f6574ebc72f56a4f354e4f104fde4a584373496482e97d52d31bc","README.md":"4c617b8ced3a27b7edecf0e5e41ed451c04e88dab529e7a35fccc4e1551efbd7","build.rs":"56b29ab6da3e49075bfd0a7b690267c8016298bf0d332e2e68bbaf19decbbf71","src/lib.rs":"7118106690b9d25c5d0a3e2079feb83d76f1d434d0da36b9d0351806d27c850d"},"package":null} -\ No newline at end of file -diff --git a/third_party/rust/any_all_workaround/Cargo.toml b/third_party/rust/any_all_workaround/Cargo.toml -new file mode 100644 ---- /dev/null -+++ third_party/rust/any_all_workaround/Cargo.toml -@@ -0,0 +1,28 @@ -+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO -+# -+# When uploading crates to the registry Cargo will automatically -+# "normalize" Cargo.toml files for maximal compatibility -+# with all versions of Cargo and also rewrite `path` dependencies -+# to registry (e.g., crates.io) dependencies. -+# -+# If you are reading this file be aware that the original Cargo.toml -+# will likely look very different (and much more reasonable). -+# See Cargo.toml.orig for the original contents. -+ -+[package] -+edition = "2021" -+name = "any_all_workaround" -+version = "0.1.0" -+authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"] -+description = "Workaround for bad LLVM codegen for boolean reductions on 32-bit ARM" -+homepage = "https://docs.rs/any_all_workaround/" -+documentation = "https://docs.rs/any_all_workaround/" -+readme = "README.md" -+license = "MIT OR Apache-2.0" -+repository = "https://github.com/hsivonen/any_all_workaround" -+ -+[dependencies] -+cfg-if = "1.0" -+ -+[build-dependencies] -+version_check = "0.9" -diff --git a/third_party/rust/packed_simd/LICENSE-APACHE b/third_party/rust/any_all_workaround/LICENSE-APACHE -rename from third_party/rust/packed_simd/LICENSE-APACHE -rename to third_party/rust/any_all_workaround/LICENSE-APACHE -diff --git a/third_party/rust/packed_simd/LICENSE-MIT b/third_party/rust/any_all_workaround/LICENSE-MIT -rename from third_party/rust/packed_simd/LICENSE-MIT -rename to third_party/rust/any_all_workaround/LICENSE-MIT -diff --git a/third_party/rust/any_all_workaround/LICENSE-MIT-QCMS b/third_party/rust/any_all_workaround/LICENSE-MIT-QCMS -new file mode 100644 ---- /dev/null -+++ third_party/rust/any_all_workaround/LICENSE-MIT-QCMS -@@ -0,0 +1,21 @@ -+qcms -+Copyright (C) 2009-2024 Mozilla Corporation -+Copyright (C) 1998-2007 Marti Maria -+ -+Permission is hereby granted, free of charge, to any person obtaining -+a copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the Software -+is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in -+all copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -+THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -diff --git a/third_party/rust/any_all_workaround/README.md b/third_party/rust/any_all_workaround/README.md -new file mode 100644 ---- /dev/null -+++ third_party/rust/any_all_workaround/README.md -@@ -0,0 +1,13 @@ -+# any_all_workaround -+ -+This is a workaround for bad codegen ([Rust bug](https://github.com/rust-lang/portable-simd/issues/146), [LLVM bug](https://github.com/llvm/llvm-project/issues/50466)) for the `any()` and `all()` reductions for NEON-backed SIMD vectors on 32-bit ARM. On other platforms these delegate to `any()` and `all()` in `core::simd`. -+ -+The plan is to abandon this crate once the LLVM bug is fixed or `core::simd` works around the LLVM bug. -+ -+The code is forked from the [`packed_simd` crate](https://raw.githubusercontent.com/hsivonen/packed_simd/d938e39bee9bc5c222f5f2f2a0df9e53b5ce36ae/src/codegen/reductions/mask/arm.rs). -+ -+This crate requires Nightly Rust as it depends on the `portable_simd` feature. -+ -+# License -+ -+`MIT OR Apache-2.0`, since that's how `packed_simd` is licensed. (The ARM intrinsics Rust version workaround is from qcms, see LICENSE-MIT-QCMS.) -diff --git a/third_party/rust/any_all_workaround/build.rs b/third_party/rust/any_all_workaround/build.rs -new file mode 100644 ---- /dev/null -+++ third_party/rust/any_all_workaround/build.rs -@@ -0,0 +1,7 @@ -+extern crate version_check as rustc; -+ -+fn main() { -+ if rustc::is_min_version("1.78.0").unwrap_or(false) { -+ println!("cargo:rustc-cfg=stdsimd_split"); -+ } -+} -diff --git a/third_party/rust/any_all_workaround/src/lib.rs b/third_party/rust/any_all_workaround/src/lib.rs -new file mode 100644 ---- /dev/null -+++ third_party/rust/any_all_workaround/src/lib.rs -@@ -0,0 +1,110 @@ -+// This code began as a fork of -+// https://raw.githubusercontent.com/rust-lang/packed_simd/d938e39bee9bc5c222f5f2f2a0df9e53b5ce36ae/src/codegen/reductions/mask/arm.rs -+// which didn't have a license header on the file, but Cargo.toml said "MIT OR Apache-2.0". -+// See LICENSE-MIT and LICENSE-APACHE. -+ -+#![no_std] -+#![feature(portable_simd)] -+#![cfg_attr( -+ all( -+ stdsimd_split, -+ target_arch = "arm", -+ target_endian = "little", -+ target_feature = "neon", -+ target_feature = "v7" -+ ), -+ feature(stdarch_arm_neon_intrinsics) -+)] -+#![cfg_attr( -+ all( -+ not(stdsimd_split), -+ target_arch = "arm", -+ target_endian = "little", -+ target_feature = "neon", -+ target_feature = "v7" -+ ), -+ feature(stdsimd) -+)] -+ -+use cfg_if::cfg_if; -+use core::simd::mask16x8; -+use core::simd::mask32x4; -+use core::simd::mask8x16; -+ -+cfg_if! { -+ if #[cfg(all(target_arch = "arm", target_endian = "little", target_feature = "neon", target_feature = "v7"))] { -+ use core::simd::mask8x8; -+ use core::simd::mask16x4; -+ use core::simd::mask32x2; -+ macro_rules! arm_128_v7_neon_impl { -+ ($all:ident, $any:ident, $id:ident, $half:ident, $vpmin:ident, $vpmax:ident) => { -+ #[inline] -+ pub fn $all(s: $id) -> bool { -+ use core::arch::arm::$vpmin; -+ use core::mem::transmute; -+ unsafe { -+ union U { -+ halves: ($half, $half), -+ vec: $id, -+ } -+ let halves = U { vec: s }.halves; -+ let h: $half = transmute($vpmin(transmute(halves.0), transmute(halves.1))); -+ h.all() -+ } -+ } -+ #[inline] -+ pub fn $any(s: $id) -> bool { -+ use core::arch::arm::$vpmax; -+ use core::mem::transmute; -+ unsafe { -+ union U { -+ halves: ($half, $half), -+ vec: $id, -+ } -+ let halves = U { vec: s }.halves; -+ let h: $half = transmute($vpmax(transmute(halves.0), transmute(halves.1))); -+ h.any() -+ } -+ } -+ } -+ } -+ } else { -+ macro_rules! arm_128_v7_neon_impl { -+ ($all:ident, $any:ident, $id:ident, $half:ident, $vpmin:ident, $vpmax:ident) => { -+ #[inline(always)] -+ pub fn $all(s: $id) -> bool { -+ s.all() -+ } -+ #[inline(always)] -+ pub fn $any(s: $id) -> bool { -+ s.any() -+ } -+ } -+ } -+ } -+} -+ -+arm_128_v7_neon_impl!( -+ all_mask8x16, -+ any_mask8x16, -+ mask8x16, -+ mask8x8, -+ vpmin_u8, -+ vpmax_u8 -+); -+arm_128_v7_neon_impl!( -+ all_mask16x8, -+ any_mask16x8, -+ mask16x8, -+ mask16x4, -+ vpmin_u16, -+ vpmax_u16 -+); -+arm_128_v7_neon_impl!( -+ all_mask32x4, -+ any_mask32x4, -+ mask32x4, -+ mask32x2, -+ vpmin_u32, -+ vpmax_u32 -+); -diff --git a/third_party/rust/encoding_rs/.cargo-checksum.json b/third_party/rust/encoding_rs/.cargo-checksum.json ---- third_party/rust/encoding_rs/.cargo-checksum.json -+++ third_party/rust/encoding_rs/.cargo-checksum.json -@@ -1,1 +1,1 @@ --{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"11789f45bb180841cd362a5eee6789c68ddb573a11105e30768c308a6add0190","Cargo.toml":"42fa83322aa9fd6723b77d35d0cacb92cbb6e7f573ce11c55f5225292866f8f4","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","LICENSE-WHATWG":"838118388fe5c2e7f1dbbaeed13e1c7f3ebf88be91319c7c1d77c18e987d1a50","README.md":"d938e8ab0b9ab67e74a1a4f48f23fdce956d0ad3a3f6147ae7612a92763c88d5","ci/miri.sh":"43cb8d82f49e3bfe2d2274b6ccd6f0714a4188ccef0cecc040829883cfdbee25","doc/Big5.txt":"f73a2edc5cb6c2d140ba6e07f4542e1c4a234950378acde1df93480f0ca0be0b","doc/EUC-JP.txt":"ee2818b907d0137f40a9ab9fd525fc700a44dbdddb6cf0c157a656566bae4bf1","doc/EUC-KR.txt":"71d9e2ccf3b124e8bdfb433c8cf2773fd878077038d0cec3c7237a50f4a78a30","doc/GBK.txt":"c1b522b5a799884e5001da661f42c5a8f4d0acb9ef1d74b206f22b5f65365606","doc/IBM866.txt":"a5a433e804d0f83af785015179fbc1d9b0eaf1f7960efcd04093e136b51fbd0e","doc/ISO-2022-JP.txt":"af86684f5a8f0e2868d7b2c292860140c3d2e5527530ca091f1b28198e8e2fe6","doc/ISO-8859-10.txt":"6d3949ad7c81ca176895101ed81a1db7df1060d64e262880b94bd31bb344ab4d","doc/ISO-8859-13.txt":"3951dd89cf93f7729148091683cf8511f4529388b7dc8dcd0d62eaed55be93fa","doc/ISO-8859-14.txt":"3d330784a0374fd255a38b47949675cc7168c800530534b0a01cac6edc623adc","doc/ISO-8859-15.txt":"24b1084aab5127a85aab99153f86e24694d0a3615f53b5ce23683f97cf66c47a","doc/ISO-8859-16.txt":"ce0272559b92ba76d7a7e476f6424ae4a5cc72e75b183611b08392e44add4d25","doc/ISO-8859-2.txt":"18ceff88c13d1b5ba455a3919b1e3de489045c4c3d2dd7e8527c125c75d54aad","doc/ISO-8859-3.txt":"21798404c68f4f5db59223362f24999da96968c0628427321fccce7d2849a130","doc/ISO-8859-4.txt":"d27f6520c6c5bfbcc19176b71d081cdb3bccde1622bb3e420d5680e812632d53","doc/ISO-8859-5.txt":"a10ec8d6ea7a78ad15da7275f6cb1a3365118527e28f9af6d0d5830501303f3a","doc/ISO-8859-6.txt":"ccda8a2efc96115336bdd77776637b9712425e44fbcf745353b9057fbef144e7","doc/ISO-8859-7.txt":"17900fa1f27a445958f0a77d7d9056be375a6bd7ee4492aa680c7c1500bab85e","doc/ISO-8859-8-I.txt":"8357555646d54265a9b9ffa3e68b08d132312f1561c60108ff9b8b1167b6ecf2","doc/ISO-8859-8.txt":"72cd6f3afb7b4a9c16a66a362473315770b7755d72c86c870e52fc3eba86c8af","doc/KOI8-R.txt":"839cf19a38da994488004ed7814b1f6151640156a9a2af02bf2efca745fb5966","doc/KOI8-U.txt":"0cc76624ed1f024183e2298b7e019957da2c70c8ca06e0fc4e6f353f50a5054f","doc/Shift_JIS.txt":"34c49141818cb9ddbcf59cc858f78a79be8ad148d563f26415108ae1f148443f","doc/UTF-16BE.txt":"e2e280d8acbaa6d2a6b3569d60e17500a285f2baa0df3363dd85537cd5a1ef8f","doc/UTF-16LE.txt":"70bdc170e3fc5298ba68f10125fb5eeb8b077036cc96bb4416c4de396f6d76c1","doc/UTF-8.txt":"ea7bae742e613010ced002cf4b601a737d2203fad65e115611451bc4428f548a","doc/gb18030.txt":"dc71378a8f07a2d8659f69ee81fb8791fef56ba86f124b429978285237bb4a7b","doc/macintosh.txt":"57491e53866711b4672d9b9ff35380b9dac9e0d8e3d6c20bdd6140603687c023","doc/replacement.txt":"4b6c3bbd7999d9d4108a281594bd02d13607e334a95465afff8c2c08d395f0e4","doc/windows-1250.txt":"61296bb6a21cdab602300d32ecfba434cb82de5ac3bc88d58710d2f125e28d39","doc/windows-1251.txt":"7deea1c61dea1485c8ff02db2c7d578db7a9aab63ab1cfd02ec04b515864689e","doc/windows-1252.txt":"933ef3bdddfce5ee132b9f1a1aa8b47423d2587bbe475b19028d0a6d38e180b6","doc/windows-1253.txt":"1a38748b88e99071a5c7b3d5456ead4caedeabab50d50d658be105bc113714de","doc/windows-1254.txt":"f8372f86c6f8d642563cd6ddc025260553292a39423df1683a98670bd7bf2b47","doc/windows-1255.txt":"4e5852494730054e2da258a74e1b9d780abbcdd8ce22ebc218ca2efe9e90493d","doc/windows-1256.txt":"c0879c5172abedead302a406e8f60d9cd9598694a0ffa4fd288ffe4fef7b8ea1","doc/windows-1257.txt":"c28a0c9f964fcb2b46d21f537c402446501a2800670481d6abf9fd9e9018d523","doc/windows-1258.txt":"5019ae4d61805c79aacbf17c93793342dbb098d65a1837783bc3e2c6d6a23602","doc/windows-874.txt":"4ef0e4501c5feba8b17aee1818602ed44b36ca8475db771ce2fc16d392cabecc","doc/x-mac-cyrillic.txt":"58be154d8a888ca3d484b83b44f749823ef339ab27f14d90ca9a856f5050a8bd","doc/x-user-defined.txt":"f9cd07c4321bf5cfb0be4bdddd251072999b04a6cf7a6f5bc63709a84e2c1ffc","generate-encoding-data.py":"be989dd25c6b946e3e8745fdc8e8a80fcf24b3be99ad0b4b78153ba3f6ab6310","rustfmt.toml":"85c1a3b4382fd89e991cbb81b70fb52780472edc064c963943cdaaa56e0a2030","src/ascii.rs":"c44c002641adb5ebc4368707a8cc0a076d2f33e6a5c27b1b69988eb515f5653d","src/big5.rs":"ec6e2913011a38e9a3e825a1731f139a7ca1d5b264fefae51a3cc1a68a57cef9","src/data.rs":"8a617cc57032092d65850eb27e00de687c80aea3299e839a1f58b42d0b35abf3","src/euc_jp.rs":"32047f5b540188c4cb19c07165f846b9786a09f18e315ed3e9bda1293dae52aa","src/euc_kr.rs":"9b25afc72d9378700eecfac58d55ad1c5946d6cd0ccde2c29c08200ef2de6bb9","src/gb18030.rs":"808587168d73f0c80f8520f0ca9b161866ed2efeb17a05e85fdf3b8efe7ba28a","src/handles.rs":"cc83dc0754751d67f5688a65c5e0191cba02f6bacce81a0813a243cba55eef7a","src/iso_2022_jp.rs":"9bb485e82574f4b7d4b2364f0ff276acb6a0bc111758420a3b0ec5e04c196652","src/lib.rs":"1dc07b818e45846b16ddcaf0de46c8862dd7df8099123ec38b95c3f8ad9c91ec","src/macros.rs":"200997f8870de8bfd8cdc475e92115df42108c0df661e49d3d1cbc32056e1d99","src/mem.rs":"0bf34103e0ad1b842a13a082dee2b920b05cf4fb0f145c9ee7f608f4cb4a544f","src/replacement.rs":"7660b34a53f8c1ca2bdfa0e51e843ec28326950952ad8bc96569feb93ac62308","src/shift_jis.rs":"6951ae67e36b1a12fa3a30734957f444d8b1b4ae0e2bde52060b29bd0f16d9d9","src/simd_funcs.rs":"2612aba86e1d201096d7e47a859bc3444f85934cc82d8adc6d39a4304d9eecfc","src/single_byte.rs":"3c9e9c1f946ae622c725ba9421240c1faa9a05e95fa10dd4642a25cb276a1edc","src/test_data/big5_in.txt":"4c5a8691f8dc717311889c63894026d2fb62725a86c4208ca274a9cc8d42a503","src/test_data/big5_in_ref.txt":"99d399e17750cf9c7cf30bb253dbfe35b81c4fcbdead93cfa48b1429213473c7","src/test_data/big5_out.txt":"6193ca97c297aa20e09396038d18e938bb7ea331c26f0f2454097296723a0b13","src/test_data/big5_out_ref.txt":"36567691f557df144f6cc520015a87038dfa156f296fcf103b56ae9a718be1fc","src/test_data/euc_kr_in.txt":"c86a7224f3215fa0d04e685622a752fdc72763e8ae076230c7fd62de57ec4074","src/test_data/euc_kr_in_ref.txt":"1f419f4ca47d708b54c73c461545a022ae2e20498fdbf8005a483d752a204883","src/test_data/euc_kr_out.txt":"e7f32e026f70be1e1b58e0047baf7d3d2c520269c4f9b9992e158b4decb0a1a3","src/test_data/euc_kr_out_ref.txt":"c9907857980b20b8e9e3b584482ed6567a2be6185d72237b6322f0404944924e","src/test_data/gb18030_in.txt":"ab7231b2d3e9afacdbd7d7f3b9e5361a7ff9f7e1cfdb4f3bd905b9362b309e53","src/test_data/gb18030_in_ref.txt":"dc5069421adca2043c55f5012b55a76fdff651d22e6e699fd0978f8d5706815c","src/test_data/gb18030_out.txt":"f0208d527f5ca63de7d9a0323be8d5cf12d8a104b2943d92c2701f0c3364dac1","src/test_data/gb18030_out_ref.txt":"6819fe47627e4ea01027003fc514b9f21a1322e732d7f1fb92cc6c5455bc6c07","src/test_data/iso_2022_jp_in.txt":"cd24bbdcb1834e25db54646fbf4c41560a13dc7540f6be3dba4f5d97d44513af","src/test_data/iso_2022_jp_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/iso_2022_jp_out.txt":"9b6f015329dda6c3f9ee5ce6dbd6fa9c89acc21283e886836c78b8d833480c21","src/test_data/iso_2022_jp_out_ref.txt":"78cb260093a20116ad9a42f43b05d1848c5ab100b6b9a850749809e943884b35","src/test_data/jis0208_in.txt":"6df3030553ffb0a6615bb33dc8ea9dca6d9623a9028e2ffec754ce3c3da824cc","src/test_data/jis0208_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/jis0208_out.txt":"4ec24477e1675ce750733bdc3c5add1cd27b6bd4ce1f09289564646e9654e857","src/test_data/jis0208_out_ref.txt":"c3e1cef5032b2b1d93a406f31ff940c4e2dfe8859b8b17ca2761fee7a75a0e48","src/test_data/jis0212_in.txt":"c011f0dd72bd7c8cd922df9374ef8d2769a77190514c77f6c62b415852eeb9fe","src/test_data/jis0212_in_ref.txt":"7d9458b3d2f73e7092a7f505c08ce1d233dde18aa679fbcf9889256239cc9e06","src/test_data/shift_jis_in.txt":"02e389ccef0dd2122e63f503899402cb7f797912c2444cc80ab93131116c5524","src/test_data/shift_jis_in_ref.txt":"512f985950ca902e643c88682dba9708b7c38d3c5ec2925168ab00ac94ab19f9","src/test_data/shift_jis_out.txt":"5fbc44da7bf639bf6cfe0fa1fd3eba7102b88f81919c9ea991302712f69426fb","src/test_data/shift_jis_out_ref.txt":"466322c6fed8286c64582731755290c2296508efdd258826e6279686649b481f","src/test_labels_names.rs":"23a2e11b02b3b8d15fb5613a625e3edb2c61e70e3c581abfd638719a4088200d","src/testing.rs":"f59e671e95a98a56f6b573e8c6be4d71e670bf52f7e20eb1605d990aafa1894e","src/utf_16.rs":"c071a147fad38d750c2c247e141b76b929a48007b99f26b2922b9caecdaf2f25","src/utf_8.rs":"7b7d887b347f1aefa03246b028a36a72758a4ce76c28f3b45c19467851aa7839","src/variant.rs":"1fab5363588a1554a7169de8731ea9cded7ac63ea35caabdd1c27a8dde68c27b","src/x_user_defined.rs":"c9c010730dfb9f141d4fed19350c08a21af240913a54bb64f5ca89ff93b6b7d1"},"package":"7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"} -\ No newline at end of file -+{"files":{"CONTRIBUTING.md":"ca1901f3e8532fb4cec894fd3664f0eaa898c0c4b961d1b992d1ed54eacf362a","COPYRIGHT":"11789f45bb180841cd362a5eee6789c68ddb573a11105e30768c308a6add0190","Cargo.toml":"22a4d210c92dae9f32c6944ef340ee8fdd027f99c081577e8907123e2a93383e","Ideas.md":"b7452893f500163868d8de52c09addaf91e1632454ed02e892c467ed7ec39dbd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"3fa4ca83dcc9237839b1bdeb2e6d16bdfb5ec0c5ce42b24694d8bbf0dcbef72c","LICENSE-WHATWG":"838118388fe5c2e7f1dbbaeed13e1c7f3ebf88be91319c7c1d77c18e987d1a50","README.md":"1d08aefcb92afa81b18154049c9abbcad4540a23f7172e9f9bbed5af33f1a087","ci/miri.sh":"43cb8d82f49e3bfe2d2274b6ccd6f0714a4188ccef0cecc040829883cfdbee25","doc/Big5.txt":"f73a2edc5cb6c2d140ba6e07f4542e1c4a234950378acde1df93480f0ca0be0b","doc/EUC-JP.txt":"ee2818b907d0137f40a9ab9fd525fc700a44dbdddb6cf0c157a656566bae4bf1","doc/EUC-KR.txt":"71d9e2ccf3b124e8bdfb433c8cf2773fd878077038d0cec3c7237a50f4a78a30","doc/GBK.txt":"c1b522b5a799884e5001da661f42c5a8f4d0acb9ef1d74b206f22b5f65365606","doc/IBM866.txt":"a5a433e804d0f83af785015179fbc1d9b0eaf1f7960efcd04093e136b51fbd0e","doc/ISO-2022-JP.txt":"af86684f5a8f0e2868d7b2c292860140c3d2e5527530ca091f1b28198e8e2fe6","doc/ISO-8859-10.txt":"6d3949ad7c81ca176895101ed81a1db7df1060d64e262880b94bd31bb344ab4d","doc/ISO-8859-13.txt":"3951dd89cf93f7729148091683cf8511f4529388b7dc8dcd0d62eaed55be93fa","doc/ISO-8859-14.txt":"3d330784a0374fd255a38b47949675cc7168c800530534b0a01cac6edc623adc","doc/ISO-8859-15.txt":"24b1084aab5127a85aab99153f86e24694d0a3615f53b5ce23683f97cf66c47a","doc/ISO-8859-16.txt":"ce0272559b92ba76d7a7e476f6424ae4a5cc72e75b183611b08392e44add4d25","doc/ISO-8859-2.txt":"18ceff88c13d1b5ba455a3919b1e3de489045c4c3d2dd7e8527c125c75d54aad","doc/ISO-8859-3.txt":"21798404c68f4f5db59223362f24999da96968c0628427321fccce7d2849a130","doc/ISO-8859-4.txt":"d27f6520c6c5bfbcc19176b71d081cdb3bccde1622bb3e420d5680e812632d53","doc/ISO-8859-5.txt":"a10ec8d6ea7a78ad15da7275f6cb1a3365118527e28f9af6d0d5830501303f3a","doc/ISO-8859-6.txt":"ccda8a2efc96115336bdd77776637b9712425e44fbcf745353b9057fbef144e7","doc/ISO-8859-7.txt":"17900fa1f27a445958f0a77d7d9056be375a6bd7ee4492aa680c7c1500bab85e","doc/ISO-8859-8-I.txt":"8357555646d54265a9b9ffa3e68b08d132312f1561c60108ff9b8b1167b6ecf2","doc/ISO-8859-8.txt":"72cd6f3afb7b4a9c16a66a362473315770b7755d72c86c870e52fc3eba86c8af","doc/KOI8-R.txt":"839cf19a38da994488004ed7814b1f6151640156a9a2af02bf2efca745fb5966","doc/KOI8-U.txt":"0cc76624ed1f024183e2298b7e019957da2c70c8ca06e0fc4e6f353f50a5054f","doc/Shift_JIS.txt":"34c49141818cb9ddbcf59cc858f78a79be8ad148d563f26415108ae1f148443f","doc/UTF-16BE.txt":"e2e280d8acbaa6d2a6b3569d60e17500a285f2baa0df3363dd85537cd5a1ef8f","doc/UTF-16LE.txt":"70bdc170e3fc5298ba68f10125fb5eeb8b077036cc96bb4416c4de396f6d76c1","doc/UTF-8.txt":"ea7bae742e613010ced002cf4b601a737d2203fad65e115611451bc4428f548a","doc/gb18030.txt":"dc71378a8f07a2d8659f69ee81fb8791fef56ba86f124b429978285237bb4a7b","doc/macintosh.txt":"57491e53866711b4672d9b9ff35380b9dac9e0d8e3d6c20bdd6140603687c023","doc/replacement.txt":"4b6c3bbd7999d9d4108a281594bd02d13607e334a95465afff8c2c08d395f0e4","doc/windows-1250.txt":"61296bb6a21cdab602300d32ecfba434cb82de5ac3bc88d58710d2f125e28d39","doc/windows-1251.txt":"7deea1c61dea1485c8ff02db2c7d578db7a9aab63ab1cfd02ec04b515864689e","doc/windows-1252.txt":"933ef3bdddfce5ee132b9f1a1aa8b47423d2587bbe475b19028d0a6d38e180b6","doc/windows-1253.txt":"1a38748b88e99071a5c7b3d5456ead4caedeabab50d50d658be105bc113714de","doc/windows-1254.txt":"f8372f86c6f8d642563cd6ddc025260553292a39423df1683a98670bd7bf2b47","doc/windows-1255.txt":"4e5852494730054e2da258a74e1b9d780abbcdd8ce22ebc218ca2efe9e90493d","doc/windows-1256.txt":"c0879c5172abedead302a406e8f60d9cd9598694a0ffa4fd288ffe4fef7b8ea1","doc/windows-1257.txt":"c28a0c9f964fcb2b46d21f537c402446501a2800670481d6abf9fd9e9018d523","doc/windows-1258.txt":"5019ae4d61805c79aacbf17c93793342dbb098d65a1837783bc3e2c6d6a23602","doc/windows-874.txt":"4ef0e4501c5feba8b17aee1818602ed44b36ca8475db771ce2fc16d392cabecc","doc/x-mac-cyrillic.txt":"58be154d8a888ca3d484b83b44f749823ef339ab27f14d90ca9a856f5050a8bd","doc/x-user-defined.txt":"f9cd07c4321bf5cfb0be4bdddd251072999b04a6cf7a6f5bc63709a84e2c1ffc","generate-encoding-data.py":"be989dd25c6b946e3e8745fdc8e8a80fcf24b3be99ad0b4b78153ba3f6ab6310","rustfmt.toml":"85c1a3b4382fd89e991cbb81b70fb52780472edc064c963943cdaaa56e0a2030","src/ascii.rs":"588e38b01e666d5e7462617ea7e90a108d608dec9e016f3d273ac0744af2e05d","src/big5.rs":"ec6e2913011a38e9a3e825a1731f139a7ca1d5b264fefae51a3cc1a68a57cef9","src/data.rs":"8a617cc57032092d65850eb27e00de687c80aea3299e839a1f58b42d0b35abf3","src/euc_jp.rs":"32047f5b540188c4cb19c07165f846b9786a09f18e315ed3e9bda1293dae52aa","src/euc_kr.rs":"9b25afc72d9378700eecfac58d55ad1c5946d6cd0ccde2c29c08200ef2de6bb9","src/gb18030.rs":"808587168d73f0c80f8520f0ca9b161866ed2efeb17a05e85fdf3b8efe7ba28a","src/handles.rs":"b08cef1f5785bb6a4822f2e844c6df1b046b737b7a075e4593eaa8c4208e9fe2","src/iso_2022_jp.rs":"9bb485e82574f4b7d4b2364f0ff276acb6a0bc111758420a3b0ec5e04c196652","src/lib.rs":"834f44b670ec48ee82c0e12223d1567313fdd9f88bca5f4b117c82c1828f559f","src/macros.rs":"200997f8870de8bfd8cdc475e92115df42108c0df661e49d3d1cbc32056e1d99","src/mem.rs":"948571137d3b151df8db4fb2c733e74ae595d055cdf0ad83abcab9341d6adabe","src/replacement.rs":"7660b34a53f8c1ca2bdfa0e51e843ec28326950952ad8bc96569feb93ac62308","src/shift_jis.rs":"6951ae67e36b1a12fa3a30734957f444d8b1b4ae0e2bde52060b29bd0f16d9d9","src/simd_funcs.rs":"05c6e77af74bfe73cd39a752067c11425d6b46e5da419910f54bf75a5c02a984","src/single_byte.rs":"3ad87116fb339434a4b58e8f2b15485f2b66b9f7814d708f16194ed08f6d6ccf","src/test_data/big5_in.txt":"4c5a8691f8dc717311889c63894026d2fb62725a86c4208ca274a9cc8d42a503","src/test_data/big5_in_ref.txt":"99d399e17750cf9c7cf30bb253dbfe35b81c4fcbdead93cfa48b1429213473c7","src/test_data/big5_out.txt":"6193ca97c297aa20e09396038d18e938bb7ea331c26f0f2454097296723a0b13","src/test_data/big5_out_ref.txt":"36567691f557df144f6cc520015a87038dfa156f296fcf103b56ae9a718be1fc","src/test_data/euc_kr_in.txt":"c86a7224f3215fa0d04e685622a752fdc72763e8ae076230c7fd62de57ec4074","src/test_data/euc_kr_in_ref.txt":"1f419f4ca47d708b54c73c461545a022ae2e20498fdbf8005a483d752a204883","src/test_data/euc_kr_out.txt":"e7f32e026f70be1e1b58e0047baf7d3d2c520269c4f9b9992e158b4decb0a1a3","src/test_data/euc_kr_out_ref.txt":"c9907857980b20b8e9e3b584482ed6567a2be6185d72237b6322f0404944924e","src/test_data/gb18030_in.txt":"ab7231b2d3e9afacdbd7d7f3b9e5361a7ff9f7e1cfdb4f3bd905b9362b309e53","src/test_data/gb18030_in_ref.txt":"dc5069421adca2043c55f5012b55a76fdff651d22e6e699fd0978f8d5706815c","src/test_data/gb18030_out.txt":"f0208d527f5ca63de7d9a0323be8d5cf12d8a104b2943d92c2701f0c3364dac1","src/test_data/gb18030_out_ref.txt":"6819fe47627e4ea01027003fc514b9f21a1322e732d7f1fb92cc6c5455bc6c07","src/test_data/iso_2022_jp_in.txt":"cd24bbdcb1834e25db54646fbf4c41560a13dc7540f6be3dba4f5d97d44513af","src/test_data/iso_2022_jp_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/iso_2022_jp_out.txt":"9b6f015329dda6c3f9ee5ce6dbd6fa9c89acc21283e886836c78b8d833480c21","src/test_data/iso_2022_jp_out_ref.txt":"78cb260093a20116ad9a42f43b05d1848c5ab100b6b9a850749809e943884b35","src/test_data/jis0208_in.txt":"6df3030553ffb0a6615bb33dc8ea9dca6d9623a9028e2ffec754ce3c3da824cc","src/test_data/jis0208_in_ref.txt":"3dc4e6a5e06471942d086b16c9440945e78415f6f3f47e43717e4bc2eac2cdf5","src/test_data/jis0208_out.txt":"4ec24477e1675ce750733bdc3c5add1cd27b6bd4ce1f09289564646e9654e857","src/test_data/jis0208_out_ref.txt":"c3e1cef5032b2b1d93a406f31ff940c4e2dfe8859b8b17ca2761fee7a75a0e48","src/test_data/jis0212_in.txt":"c011f0dd72bd7c8cd922df9374ef8d2769a77190514c77f6c62b415852eeb9fe","src/test_data/jis0212_in_ref.txt":"7d9458b3d2f73e7092a7f505c08ce1d233dde18aa679fbcf9889256239cc9e06","src/test_data/shift_jis_in.txt":"02e389ccef0dd2122e63f503899402cb7f797912c2444cc80ab93131116c5524","src/test_data/shift_jis_in_ref.txt":"512f985950ca902e643c88682dba9708b7c38d3c5ec2925168ab00ac94ab19f9","src/test_data/shift_jis_out.txt":"5fbc44da7bf639bf6cfe0fa1fd3eba7102b88f81919c9ea991302712f69426fb","src/test_data/shift_jis_out_ref.txt":"466322c6fed8286c64582731755290c2296508efdd258826e6279686649b481f","src/test_labels_names.rs":"23a2e11b02b3b8d15fb5613a625e3edb2c61e70e3c581abfd638719a4088200d","src/testing.rs":"f59e671e95a98a56f6b573e8c6be4d71e670bf52f7e20eb1605d990aafa1894e","src/utf_16.rs":"c071a147fad38d750c2c247e141b76b929a48007b99f26b2922b9caecdaf2f25","src/utf_8.rs":"7b7d887b347f1aefa03246b028a36a72758a4ce76c28f3b45c19467851aa7839","src/variant.rs":"1fab5363588a1554a7169de8731ea9cded7ac63ea35caabdd1c27a8dde68c27b","src/x_user_defined.rs":"9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae"},"package":"b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"} -\ No newline at end of file -diff --git a/third_party/rust/encoding_rs/Cargo.toml b/third_party/rust/encoding_rs/Cargo.toml ---- third_party/rust/encoding_rs/Cargo.toml -+++ third_party/rust/encoding_rs/Cargo.toml -@@ -6,18 +6,19 @@ - # to registry (e.g., crates.io) dependencies. - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2018" -+rust-version = "1.36" - name = "encoding_rs" --version = "0.8.33" -+version = "0.8.34" - authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"] - description = "A Gecko-oriented implementation of the Encoding Standard" - homepage = "https://docs.rs/encoding_rs/" - documentation = "https://docs.rs/encoding_rs/" - readme = "README.md" - keywords = [ - "encoding", - "web", -@@ -31,23 +32,23 @@ categories = [ - "internationalization", - ] - license = "(Apache-2.0 OR MIT) AND BSD-3-Clause" - repository = "https://github.com/hsivonen/encoding_rs" - - [profile.release] - lto = true - -+[dependencies.any_all_workaround] -+version = "0.1.0" -+optional = true -+ - [dependencies.cfg-if] - version = "1.0" - --[dependencies.packed_simd] --version = "0.3.9" --optional = true -- - [dependencies.serde] - version = "1.0" - optional = true - - [dev-dependencies.bincode] - version = "1.0" - - [dev-dependencies.serde_derive] -@@ -69,15 +70,9 @@ fast-legacy-encode = [ - "fast-hanja-encode", - "fast-kanji-encode", - "fast-gb-hanzi-encode", - "fast-big5-hanzi-encode", - ] - less-slow-big5-hanzi-encode = [] - less-slow-gb-hanzi-encode = [] - less-slow-kanji-encode = [] --simd-accel = [ -- "packed_simd", -- "packed_simd/into_bits", --] -- --[badges.travis-ci] --repository = "hsivonen/encoding_rs" -+simd-accel = ["any_all_workaround"] -diff --git a/third_party/rust/encoding_rs/README.md b/third_party/rust/encoding_rs/README.md ---- third_party/rust/encoding_rs/README.md -+++ third_party/rust/encoding_rs/README.md -@@ -162,50 +162,36 @@ wrappers. - * [C++](https://github.com/hsivonen/recode_cpp) - - ## Optional features - - There are currently these optional cargo features: - - ### `simd-accel` - --Enables SIMD acceleration using the nightly-dependent `packed_simd` crate. -+Enables SIMD acceleration using the nightly-dependent `portable_simd` standard -+library feature. - - This is an opt-in feature, because enabling this feature _opts out_ of Rust's - guarantees of future compilers compiling old code (aka. "stability story"). - - Currently, this has not been tested to be an improvement except for these --targets: -+targets and enabling the `simd-accel` feature is expected to break the build -+on other targets: - - * x86_64 - * i686 - * aarch64 - * thumbv7neon - - If you use nightly Rust, you use targets whose first component is one of the - above, and you are prepared _to have to revise your configuration when updating - Rust_, you should enable this feature. Otherwise, please _do not_ enable this - feature. - --_Note!_ If you are compiling for a target that does not have 128-bit SIMD --enabled as part of the target definition and you are enabling 128-bit SIMD --using `-C target_feature`, you need to enable the `core_arch` Cargo feature --for `packed_simd` to compile a crates.io snapshot of `core_arch` instead of --using the standard-library copy of `core::arch`, because the `core::arch` --module of the pre-compiled standard library has been compiled with the --assumption that the CPU doesn't have 128-bit SIMD. At present this applies --mainly to 32-bit ARM targets whose first component does not include the --substring `neon`. -- --The encoding_rs side of things has not been properly set up for POWER, --PowerPC, MIPS, etc., SIMD at this time, so even if you were to follow --the advice from the previous paragraph, you probably shouldn't use --the `simd-accel` option on the less mainstream architectures at this --time. -- - Used by Firefox. - - ### `serde` - - Enables support for serializing and deserializing `&'static Encoding`-typed - struct fields using [Serde][1]. - - [1]: https://serde.rs/ -@@ -376,18 +362,19 @@ It is a goal to support the latest stabl - the version of Rust that's used for Firefox Nightly. - - At this time, there is no firm commitment to support a version older than - what's required by Firefox, and there is no commitment to treat MSRV changes - as semver-breaking, because this crate depends on `cfg-if`, which doesn't - appear to treat MSRV changes as semver-breaking, so it would be useless for - this crate to treat MSRV changes as semver-breaking. - --As of 2021-02-04, MSRV appears to be Rust 1.36.0 for using the crate and -+As of 2024-04-04, MSRV appears to be Rust 1.36.0 for using the crate and - 1.42.0 for doc tests to pass without errors about the global allocator. -+With the `simd-accel` feature, the MSRV is even higher. - - ## Compatibility with rust-encoding - - A compatibility layer that implements the rust-encoding API on top of - encoding_rs is - [provided as a separate crate](https://github.com/hsivonen/encoding_rs_compat) - (cannot be uploaded to crates.io). The compatibility layer was originally - written with the assuption that Firefox would need it, but it is not currently -@@ -441,20 +428,27 @@ To regenerate the generated code: - - [x] Implement the rust-encoding API in terms of encoding_rs. - - [x] Add SIMD acceleration for Aarch64. - - [x] Investigate the use of NEON on 32-bit ARM. - - [ ] ~Investigate Björn Höhrmann's lookup table acceleration for UTF-8 as - adapted to Rust in rust-encoding.~ - - [x] Add actually fast CJK encode options. - - [ ] ~Investigate [Bob Steagall's lookup table acceleration for UTF-8](https://github.com/BobSteagall/CppNow2018/blob/master/FastConversionFromUTF-8/Fast%20Conversion%20From%20UTF-8%20with%20C%2B%2B%2C%20DFAs%2C%20and%20SSE%20Intrinsics%20-%20Bob%20Steagall%20-%20C%2B%2BNow%202018.pdf).~ - - [x] Provide a build mode that works without `alloc` (with lesser API surface). --- [ ] Migrate to `std::simd` once it is stable and declare 1.0. -+- [x] Migrate to `std::simd` ~once it is stable and declare 1.0.~ -+- [ ] Migrate `unsafe` slice access by larger types than `u8`/`u16` to `align_to`. - - ## Release Notes - -+### 0.8.34 -+ -+* Use the `portable_simd` nightly feature of the standard library instead of the `packed_simd` crate. Only affects the `simd-accel` optional nightly feature. -+* Internal documentation improvements and minor code improvements around `unsafe`. -+* Added `rust-version` to `Cargo.toml`. -+ - ### 0.8.33 - - * Use `packed_simd` instead of `packed_simd_2` again now that updates are back under the `packed_simd` name. Only affects the `simd-accel` optional nightly feature. - - ### 0.8.32 - - * Removed `build.rs`. (This removal should resolve false positives reported by some antivirus products. This may break some build configurations that have opted out of Rust's guarantees against future build breakage.) - * Internal change to what API is used for reinterpreting the lane configuration of SIMD vectors. -diff --git a/third_party/rust/encoding_rs/src/ascii.rs b/third_party/rust/encoding_rs/src/ascii.rs ---- third_party/rust/encoding_rs/src/ascii.rs -+++ third_party/rust/encoding_rs/src/ascii.rs -@@ -46,71 +46,87 @@ cfg_if! { - #[allow(dead_code)] - #[inline(always)] - fn likely(b: bool) -> bool { - b - } - } - } - -+// Safety invariants for masks: data & mask = 0 for valid ASCII or basic latin utf-16 -+ - // `as` truncates, so works on 32-bit, too. - #[allow(dead_code)] - pub const ASCII_MASK: usize = 0x8080_8080_8080_8080u64 as usize; - - // `as` truncates, so works on 32-bit, too. - #[allow(dead_code)] - pub const BASIC_LATIN_MASK: usize = 0xFF80_FF80_FF80_FF80u64 as usize; - - #[allow(unused_macros)] - macro_rules! ascii_naive { - ($name:ident, $src_unit:ty, $dst_unit:ty) => { -+ /// Safety: src and dst must have len_unit elements and be aligned -+ /// Safety-usable invariant: will return Some() when it fails -+ /// to convert. The first value will be a u8 that is > 127. - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - // Yes, manually omitting the bound check here matters - // a lot for perf. - for i in 0..len { -+ // Safety: len invariant used here - let code_unit = *(src.add(i)); -+ // Safety: Upholds safety-usable invariant here - if code_unit > 127 { - return Some((code_unit, i)); - } -+ // Safety: len invariant used here - *(dst.add(i)) = code_unit as $dst_unit; - } - return None; - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_alu { - ($name:ident, -+ // safety invariant: src/dst MUST be u8 - $src_unit:ty, - $dst_unit:ty, -+ // Safety invariant: stride_fn must consume and produce two usizes, and return the index of the first non-ascii when it fails - $stride_fn:ident) => { -+ /// Safety: src and dst must have len elements, src is valid for read, dst is valid for -+ /// write -+ /// Safety-usable invariant: will return Some() when it fails -+ /// to convert. The first value will be a u8 that is > 127. - #[cfg_attr(feature = "cargo-clippy", allow(never_loop, cast_ptr_alignment))] - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; - // This loop is only broken out of as a `goto` forward - loop { -+ // Safety: until_alignment becomes the number of bytes we need to munch until we are aligned to usize - let mut until_alignment = { - // Check if the other unit aligns if we move the narrower unit - // to alignment. - // if ::core::mem::size_of::<$src_unit>() == ::core::mem::size_of::<$dst_unit>() { - // ascii_to_ascii - let src_alignment = (src as usize) & ALU_ALIGNMENT_MASK; - let dst_alignment = (dst as usize) & ALU_ALIGNMENT_MASK; - if src_alignment != dst_alignment { -+ // Safety: bails early and ends up in the naïve branch where usize-alignment doesn't matter - break; - } - (ALU_ALIGNMENT - src_alignment) & ALU_ALIGNMENT_MASK - // } else if ::core::mem::size_of::<$src_unit>() < ::core::mem::size_of::<$dst_unit>() { - // ascii_to_basic_latin - // let src_until_alignment = (ALIGNMENT - ((src as usize) & ALIGNMENT_MASK)) & ALIGNMENT_MASK; - // if (dst.add(src_until_alignment) as usize) & ALIGNMENT_MASK != 0 { - // break; -@@ -129,74 +145,104 @@ macro_rules! ascii_alu { - // Moving pointers to alignment seems to be a pessimization on - // x86_64 for operations that have UTF-16 as the internal - // Unicode representation. However, since it seems to be a win - // on ARM (tested ARMv7 code running on ARMv8 [rpi3]), except - // mixed results when encoding from UTF-16 and since x86 and - // x86_64 should be using SSE2 in due course, keeping the move - // to alignment here. It would be good to test on more ARM CPUs - // and on real MIPS and POWER hardware. -+ // -+ // Safety: This is the naïve code once again, for `until_alignment` bytes - while until_alignment != 0 { - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; -+ // Safety: offset is the number of bytes copied so far - offset += 1; - until_alignment -= 1; - } - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { -+ // Safety: num_ascii is known to be a byte index of a non-ascii byte due to stride_fn's invariant - if let Some(num_ascii) = $stride_fn( -+ // Safety: These are known to be valid and aligned since we have at -+ // least ALU_STRIDE_SIZE data in these buffers, and offset is the -+ // number of elements copied so far, which according to the -+ // until_alignment calculation above will cause both src and dst to be -+ // aligned to usize after this add - src.add(offset) as *const usize, - dst.add(offset) as *mut usize, - ) { - offset += num_ascii; -+ // Safety: Upholds safety-usable invariant here by indexing into non-ascii byte - return Some((*(src.add(offset)), offset)); - } -+ // Safety: offset continues to be the number of bytes copied so far, and -+ // maintains usize alignment for the next loop iteration - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > len - stride. This loop will continue as long as -+ // `offset <= len - stride`, which means there are `stride` bytes to still be read. - if offset > len_minus_stride { - break; - } - } - } - break; - } -+ -+ // Safety: This is the naïve code, same as ascii_naive, and has no requirements -+ // other than src/dst being valid for the the right lens - while offset < len { -+ // Safety: len invariant used here - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } -+ // Safety: len invariant used here - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! basic_latin_alu { - ($name:ident, -+ // safety invariant: use u8 for src/dest for ascii, and u16 for basic_latin - $src_unit:ty, - $dst_unit:ty, -+ // safety invariant: stride function must munch ALU_STRIDE_SIZE*size(src_unit) bytes off of src and -+ // write ALU_STRIDE_SIZE*size(dst_unit) bytes to dst - $stride_fn:ident) => { -+ /// Safety: src and dst must have len elements, src is valid for read, dst is valid for -+ /// write -+ /// Safety-usable invariant: will return Some() when it fails -+ /// to convert. The first value will be a u8 that is > 127. - #[cfg_attr( - feature = "cargo-clippy", - allow(never_loop, cast_ptr_alignment, cast_lossless) - )] - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; - // This loop is only broken out of as a `goto` forward - loop { -+ // Safety: until_alignment becomes the number of bytes we need to munch from src/dest until we are aligned to usize -+ // We ensure basic-latin has the same alignment as ascii, starting with ascii since it is smaller. - let mut until_alignment = { - // Check if the other unit aligns if we move the narrower unit - // to alignment. - // if ::core::mem::size_of::<$src_unit>() == ::core::mem::size_of::<$dst_unit>() { - // ascii_to_ascii - // let src_alignment = (src as usize) & ALIGNMENT_MASK; - // let dst_alignment = (dst as usize) & ALIGNMENT_MASK; - // if src_alignment != dst_alignment { -@@ -232,66 +278,89 @@ macro_rules! basic_latin_alu { - // Moving pointers to alignment seems to be a pessimization on - // x86_64 for operations that have UTF-16 as the internal - // Unicode representation. However, since it seems to be a win - // on ARM (tested ARMv7 code running on ARMv8 [rpi3]), except - // mixed results when encoding from UTF-16 and since x86 and - // x86_64 should be using SSE2 in due course, keeping the move - // to alignment here. It would be good to test on more ARM CPUs - // and on real MIPS and POWER hardware. -+ // -+ // Safety: This is the naïve code once again, for `until_alignment` bytes - while until_alignment != 0 { - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; -+ // Safety: offset is the number of bytes copied so far - offset += 1; - until_alignment -= 1; - } - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { - if !$stride_fn( -+ // Safety: These are known to be valid and aligned since we have at -+ // least ALU_STRIDE_SIZE data in these buffers, and offset is the -+ // number of elements copied so far, which according to the -+ // until_alignment calculation above will cause both src and dst to be -+ // aligned to usize after this add - src.add(offset) as *const usize, - dst.add(offset) as *mut usize, - ) { - break; - } -+ // Safety: offset continues to be the number of bytes copied so far, and -+ // maintains usize alignment for the next loop iteration - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > len - stride. This loop will continue as long as -+ // `offset <= len - stride`, which means there are `stride` bytes to still be read. - if offset > len_minus_stride { - break; - } - } - } - break; - } -+ // Safety: This is the naïve code once again, for leftover bytes - while offset < len { -+ // Safety: len invariant used here - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: Upholds safety-usable invariant here - return Some((code_unit, offset)); - } -+ // Safety: len invariant used here - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_alu { -+ // safety invariant: stride function must munch ALU_STRIDE_SIZE*size(src_unit) bytes off of src and -+ // write ALU_STRIDE_SIZE*size(dst_unit) bytes to dst - ($name:ident, $src_unit:ty, $dst_unit:ty, $stride_fn:ident) => { -+ /// Safety: src and dst must have len elements, src is valid for read, dst is valid for -+ /// write - #[cfg_attr( - feature = "cargo-clippy", - allow(never_loop, cast_ptr_alignment, cast_lossless) - )] - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let mut offset = 0usize; - // This loop is only broken out of as a `goto` forward - loop { -+ // Safety: until_alignment becomes the number of bytes we need to munch from src/dest until we are aligned to usize -+ // We ensure the UTF-16 side has the same alignment as the Latin-1 side, starting with Latin-1 since it is smaller. - let mut until_alignment = { - if ::core::mem::size_of::<$src_unit>() < ::core::mem::size_of::<$dst_unit>() { - // unpack - let src_until_alignment = (ALU_ALIGNMENT - - ((src as usize) & ALU_ALIGNMENT_MASK)) - & ALU_ALIGNMENT_MASK; - if (dst.wrapping_add(src_until_alignment) as usize) & ALU_ALIGNMENT_MASK - != 0 -@@ -308,373 +377,485 @@ macro_rules! latin1_alu { - != 0 - { - break; - } - dst_until_alignment - } - }; - if until_alignment + ALU_STRIDE_SIZE <= len { -+ // Safety: This is the naïve code once again, for `until_alignment` bytes - while until_alignment != 0 { - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; -+ // Safety: offset is the number of bytes copied so far - offset += 1; - until_alignment -= 1; - } - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { - $stride_fn( -+ // Safety: These are known to be valid and aligned since we have at -+ // least ALU_STRIDE_SIZE data in these buffers, and offset is the -+ // number of elements copied so far, which according to the -+ // until_alignment calculation above will cause both src and dst to be -+ // aligned to usize after this add - src.add(offset) as *const usize, - dst.add(offset) as *mut usize, - ); -+ // Safety: offset continues to be the number of bytes copied so far, and -+ // maintains usize alignment for the next loop iteration - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > len - stride. This loop will continue as long as -+ // `offset <= len - stride`, which means there are `stride` bytes to still be read. - if offset > len_minus_stride { - break; - } - } - } - break; - } -+ // Safety: This is the naïve code once again, for leftover bytes - while offset < len { -+ // Safety: len invariant used here - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_simd_check_align { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned/aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_dst_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident - ) => { -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. -+ /// -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - // XXX Should we first process one stride unconditionally as unaligned to - // avoid the cost of the branchiness below if the first stride fails anyway? - // XXX Should we just use unaligned SSE2 access unconditionally? It seems that - // on Haswell, it would make sense to just use unaligned and not bother - // checking. Need to benchmark older architectures before deciding. - let dst_masked = (dst as usize) & SIMD_ALIGNMENT_MASK; -+ // Safety: checking whether src is aligned - if ((src as usize) & SIMD_ALIGNMENT_MASK) == 0 { -+ // Safety: Checking whether dst is aligned - if dst_masked == 0 { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_both_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_src_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - } else { - if dst_masked == 0 { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_dst_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: We're valid to read/write SIMD_STRIDE_SIZE elements and have the appropriate alignments - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - } - } - while offset < len { -+ // Safety: uses len invariant here and below - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety: upholds safety-usable invariant - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_simd_check_align_unrolled { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing 2*SIMD_STRIDE_SIZE src_unit/dst_unit - $double_stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing 2*SIMD_STRIDE_SIZE src_unit/dst_unit - $double_stride_src_aligned:ident - ) => { -- #[inline(always)] -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. -+ /// -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let unit_size = ::core::mem::size_of::<$src_unit>(); - let mut offset = 0usize; - // This loop is only broken out of as a goto forward without - // actually looping - 'outer: loop { -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { - // First, process one unaligned -+ // Safety: this is safe to call since we're valid for this read/write - if !$stride_neither_aligned(src, dst) { - break 'outer; - } - offset = SIMD_STRIDE_SIZE; - - // We have now seen 16 ASCII bytes. Let's guess that - // there will be enough more to justify more expense - // in the case of non-ASCII. - // Use aligned reads for the sake of old microachitectures. -+ // -+ // Safety: this correctly calculates the number of src_units that need to be read before the remaining list is aligned. -+ // This is less that SIMD_ALIGNMENT, which is also SIMD_STRIDE_SIZE (as documented) - let until_alignment = ((SIMD_ALIGNMENT - - ((src.add(offset) as usize) & SIMD_ALIGNMENT_MASK)) - & SIMD_ALIGNMENT_MASK) - / unit_size; -- // This addition won't overflow, because even in the 32-bit PAE case the -+ // Safety: This addition won't overflow, because even in the 32-bit PAE case the - // address space holds enough code that the slice length can't be that - // close to address space size. - // offset now equals SIMD_STRIDE_SIZE, hence times 3 below. -+ // -+ // Safety: if this check succeeds we're valid for reading/writing at least `2 * SIMD_STRIDE_SIZE` elements plus `until_alignment`. -+ // The extra SIMD_STRIDE_SIZE in the condition is because `offset` is already `SIMD_STRIDE_SIZE`. - if until_alignment + (SIMD_STRIDE_SIZE * 3) <= len { - if until_alignment != 0 { -+ // Safety: this is safe to call since we're valid for this read/write (and more), and don't care about alignment -+ // This will copy over bytes that get decoded twice since it's not incrementing `offset` by SIMD_STRIDE_SIZE. This is fine. - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += until_alignment; - } -+ // Safety: At this point we're valid for reading/writing 2*SIMD_STRIDE_SIZE elements -+ // Safety: Now `offset` is aligned for `src` - let len_minus_stride_times_two = len - (SIMD_STRIDE_SIZE * 2); -+ // Safety: This is whether dst is aligned - let dst_masked = (dst.add(offset) as usize) & SIMD_ALIGNMENT_MASK; - if dst_masked == 0 { - loop { -+ // Safety: both are aligned, we can call the aligned function. We're valid for reading/writing double stride from the initial condition -+ // and the loop break condition below - if let Some(advance) = - $double_stride_both_aligned(src.add(offset), dst.add(offset)) - { - offset += advance; - let code_unit = *(src.add(offset)); -+ // Safety: uses safety-usable invariant on ascii_to_ascii_simd_double_stride to return -+ // guaranteed non-ascii - return Some((code_unit, offset)); - } - offset += SIMD_STRIDE_SIZE * 2; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } -+ // Safety: We're valid for reading/writing one more, and can still assume alignment - if offset + SIMD_STRIDE_SIZE <= len { - if !$stride_both_aligned(src.add(offset), dst.add(offset)) { - break 'outer; - } - offset += SIMD_STRIDE_SIZE; - } - } else { - loop { -+ // Safety: only src is aligned here. We're valid for reading/writing double stride from the initial condition -+ // and the loop break condition below - if let Some(advance) = - $double_stride_src_aligned(src.add(offset), dst.add(offset)) - { - offset += advance; - let code_unit = *(src.add(offset)); -+ // Safety: uses safety-usable invariant on ascii_to_ascii_simd_double_stride to return -+ // guaranteed non-ascii - return Some((code_unit, offset)); - } - offset += SIMD_STRIDE_SIZE * 2; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. -+ - if offset > len_minus_stride_times_two { - break; - } - } -+ // Safety: We're valid for reading/writing one more, and can still assume alignment - if offset + SIMD_STRIDE_SIZE <= len { - if !$stride_src_aligned(src.add(offset), dst.add(offset)) { - break 'outer; - } - offset += SIMD_STRIDE_SIZE; - } - } - } else { - // At most two iterations, so unroll - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: The check above ensures we're allowed to read/write this, and we don't use alignment - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: The check above ensures we're allowed to read/write this, and we don't use alignment - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; - } - } - } - } - break 'outer; - } - while offset < len { -+ // Safety: relies straightforwardly on the `len` invariant - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_simd_check_align { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned/aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_dst_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident -+ - ) => { -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; -+ // Whether dst is aligned - let dst_masked = (dst as usize) & SIMD_ALIGNMENT_MASK; -+ // Whether src is aligned - if ((src as usize) & SIMD_ALIGNMENT_MASK) == 0 { - if dst_masked == 0 { - loop { -+ // Safety: Both were aligned, we can use the aligned function - $stride_both_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: src was aligned, dst was not - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } - } else { - if dst_masked == 0 { - loop { -+ // Safety: src was aligned, dst was not - $stride_dst_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } else { - loop { -+ // Safety: Neither were aligned - $stride_neither_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which means in the next iteration we're valid for -+ // reading/writing at least SIMD_STRIDE_SIZE elements. - if offset > len_minus_stride { - break; - } - } - } - } - } - while offset < len { -+ // Safety: relies straightforwardly on the `len` invariant - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_simd_check_align_unrolled { - ( - $name:ident, - $src_unit:ty, - $dst_unit:ty, -+ // Safety: This function must require aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_both_aligned:ident, -+ // Safety: This function must require aligned/unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_src_aligned:ident, -+ // Safety: This function must require unaligned/aligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_dst_aligned:ident, -+ // Safety: This function must require unaligned src/dest that are valid for reading/writing SIMD_STRIDE_SIZE src_unit/dst_unit - $stride_neither_aligned:ident - ) => { -+ /// Safety: src/dst must be valid for reads/writes of `len` elements of their units. - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let unit_size = ::core::mem::size_of::<$src_unit>(); - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `SIMD_STRIDE_SIZE` elements. - if SIMD_STRIDE_SIZE <= len { -+ // Safety: this correctly calculates the number of src_units that need to be read before the remaining list is aligned. -+ // This is by definition less than SIMD_STRIDE_SIZE. - let mut until_alignment = ((SIMD_STRIDE_SIZE - - ((src as usize) & SIMD_ALIGNMENT_MASK)) - & SIMD_ALIGNMENT_MASK) - / unit_size; - while until_alignment != 0 { -+ // Safety: This is a straightforward copy, since until_alignment is < SIMD_STRIDE_SIZE < len, this is in-bounds - *(dst.add(offset)) = *(src.add(offset)) as $dst_unit; - offset += 1; - until_alignment -= 1; - } -+ // Safety: here offset will be `until_alignment`, i.e. enough to align `src`. - let len_minus_stride = len - SIMD_STRIDE_SIZE; -+ // Safety: if this check succeeds we're valid for reading/writing at least `2 * SIMD_STRIDE_SIZE` elements. - if offset + SIMD_STRIDE_SIZE * 2 <= len { - let len_minus_stride_times_two = len_minus_stride - SIMD_STRIDE_SIZE; -+ // Safety: at this point src is known to be aligned at offset, dst is not. - if (dst.add(offset) as usize) & SIMD_ALIGNMENT_MASK == 0 { - loop { -+ // Safety: We checked alignment of dst above, we can use the alignment functions. We're allowed to read/write 2*SIMD_STRIDE_SIZE elements, which we do. - $stride_both_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; - $stride_both_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } - } else { - loop { -+ // Safety: we ensured alignment of src already. - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } - } - } -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE` which means we are valid to munch SIMD_STRIDE_SIZE more elements, which we do - if offset < len_minus_stride { - $stride_src_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; - } - } - while offset < len { -+ // Safety: uses len invariant here and below - let code_unit = *(src.add(offset)); - // On x86_64, this loop autovectorizes but in the pack - // case there are instructions whose purpose is to make sure - // each u16 in the vector is truncated before packing. However, - // since we don't care about saturating behavior of SSE2 packing - // when the input isn't Latin1, those instructions are useless. - // Unfortunately, using the `assume` intrinsic to lie to the - // optimizer doesn't make LLVM omit the trunctation that we -@@ -688,138 +869,180 @@ macro_rules! latin1_simd_check_align_unr - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_simd_unalign { -+ // Safety: stride_neither_aligned must be a function that requires src/dest be valid for unaligned reads/writes for SIMD_STRIDE_SIZE elements of type src_unit/dest_unit - ($name:ident, $src_unit:ty, $dst_unit:ty, $stride_neither_aligned:ident) => { -+ /// Safety: src and dst must be valid for reads/writes of len elements of type src_unit/dst_unit -+ /// -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[inline(always)] - pub unsafe fn $name( - src: *const $src_unit, - dst: *mut $dst_unit, - len: usize, - ) -> Option<($src_unit, usize)> { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { -+ // Safety: We know we're valid for `stride` reads/writes, so we can call this function. We don't need alignment. - if !$stride_neither_aligned(src.add(offset), dst.add(offset)) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // This is `offset > len - stride` which means we always have at least `stride` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { -+ // Safety: Uses len invariant here and below - let code_unit = *(src.add(offset)); - if code_unit > 127 { -+ // Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! latin1_simd_unalign { -+ // Safety: stride_neither_aligned must be a function that requires src/dest be valid for unaligned reads/writes for SIMD_STRIDE_SIZE elements of type src_unit/dest_unit - ($name:ident, $src_unit:ty, $dst_unit:ty, $stride_neither_aligned:ident) => { -+ /// Safety: src and dst must be valid for unaligned reads/writes of len elements of type src_unit/dst_unit - #[inline(always)] - pub unsafe fn $name(src: *const $src_unit, dst: *mut $dst_unit, len: usize) { - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { -+ // Safety: We know we're valid for `stride` reads/writes, so we can call this function. We don't need alignment. - $stride_neither_aligned(src.add(offset), dst.add(offset)); - offset += SIMD_STRIDE_SIZE; -+ // This is `offset > len - stride` which means we always have at least `stride` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { -+ // Safety: Uses len invariant here - let code_unit = *(src.add(offset)); - *(dst.add(offset)) = code_unit as $dst_unit; - offset += 1; - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_ascii_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u8) -> bool { - let simd = $load(src); - if !simd_is_ascii(simd) { - return false; - } - $store(dst, simd); - true - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_ascii_simd_double_stride { -+ // Safety: store must be valid for 32 bytes of write, which may be unaligned (candidates: `store(8|16)_(aligned|unaligned)`) - ($name:ident, $store:ident) => { -+ /// Safety: src must be valid for 32 bytes of aligned u8x16 read -+ /// dst must be valid for 32 bytes of unaligned write according to -+ /// the $store fn, which may allow for unaligned writes or require -+ /// alignment to either 16x8 or u8x16. -+ /// -+ /// Safety-usable invariant: Returns Some(index) if the element at `index` is invalid ASCII - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u8) -> Option<usize> { - let first = load16_aligned(src); - let second = load16_aligned(src.add(SIMD_STRIDE_SIZE)); - $store(dst, first); - if unlikely(!simd_is_ascii(first | second)) { -+ // Safety: mask_ascii produces a mask of all the high bits. - let mask_first = mask_ascii(first); - if mask_first != 0 { -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src -+ // TODO SAFETY: What about big-endian systems? - return Some(mask_first.trailing_zeros() as usize); - } - $store(dst.add(SIMD_STRIDE_SIZE), second); - let mask_second = mask_ascii(second); -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src - return Some(SIMD_STRIDE_SIZE + mask_second.trailing_zeros() as usize); - } - $store(dst.add(SIMD_STRIDE_SIZE), second); - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_basic_latin_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 16/32 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u16) -> bool { - let simd = $load(src); - if !simd_is_ascii(simd) { - return false; - } - let (first, second) = simd_unpack(simd); - $store(dst, first); - $store(dst.add(8), second); - true - } - }; - } - - #[allow(unused_macros)] - macro_rules! ascii_to_basic_latin_simd_double_stride { -+ // Safety: store must be valid for 16 bytes of write, which may be unaligned - ($name:ident, $store:ident) => { -+ /// Safety: src must be valid for 2*SIMD_STRIDE_SIZE bytes of aligned reads, -+ /// aligned to either 16x8 or u8x16. -+ /// dst must be valid for 2*SIMD_STRIDE_SIZE bytes of aligned or unaligned reads - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u16) -> Option<usize> { - let first = load16_aligned(src); - let second = load16_aligned(src.add(SIMD_STRIDE_SIZE)); - let (a, b) = simd_unpack(first); - $store(dst, a); -+ // Safety: divide by 2 since it's a u16 pointer - $store(dst.add(SIMD_STRIDE_SIZE / 2), b); - if unlikely(!simd_is_ascii(first | second)) { - let mask_first = mask_ascii(first); - if mask_first != 0 { - return Some(mask_first.trailing_zeros() as usize); - } - let (c, d) = simd_unpack(second); - $store(dst.add(SIMD_STRIDE_SIZE), c); -@@ -832,47 +1055,59 @@ macro_rules! ascii_to_basic_latin_simd_d - $store(dst.add(SIMD_STRIDE_SIZE + (SIMD_STRIDE_SIZE / 2)), d); - None - } - }; - } - - #[allow(unused_macros)] - macro_rules! unpack_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u8, dst: *mut u16) { - let simd = $load(src); - let (first, second) = simd_unpack(simd); - $store(dst, first); - $store(dst.add(8), second); - } - }; - } - - #[allow(unused_macros)] - macro_rules! basic_latin_to_ascii_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 32/16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u16, dst: *mut u8) -> bool { - let first = $load(src); - let second = $load(src.add(8)); - if simd_is_basic_latin(first | second) { - $store(dst, simd_pack(first, second)); - true - } else { - false - } - } - }; - } - - #[allow(unused_macros)] - macro_rules! pack_simd_stride { -+ // Safety: load/store must be valid for 16 bytes of read/write, which may be unaligned. (candidates: `(load|store)(16|8)_(unaligned|aligned)` functions) - ($name:ident, $load:ident, $store:ident) => { -+ /// Safety: src and dst must be valid for 32/16 bytes of read/write according to -+ /// the $load/$store fn, which may allow for unaligned reads/writes or require -+ /// alignment to either 16x8 or u8x16. - #[inline(always)] - pub unsafe fn $name(src: *const u16, dst: *mut u8) { - let first = $load(src); - let second = $load(src.add(8)); - $store(dst, simd_pack(first, second)); - } - }; - } -@@ -888,24 +1123,28 @@ cfg_if! { - // pub const ALIGNMENT: usize = 8; - - pub const ALU_STRIDE_SIZE: usize = 16; - - pub const ALU_ALIGNMENT: usize = 8; - - pub const ALU_ALIGNMENT_MASK: usize = 7; - -+ // Safety for stride macros: We stick to the load8_aligned/etc family of functions. We consistently produce -+ // neither_unaligned variants using only unaligned inputs. - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_neither_aligned, load16_unaligned, store16_unaligned); - - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_neither_aligned, load16_unaligned, store8_unaligned); - unpack_simd_stride!(unpack_stride_neither_aligned, load16_unaligned, store8_unaligned); - - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_neither_aligned, load8_unaligned, store16_unaligned); - pack_simd_stride!(pack_stride_neither_aligned, load8_unaligned, store16_unaligned); - -+ // Safety for conversion macros: We use the unalign macro with unalign functions above. All stride functions were produced -+ // by stride macros that universally munch a single SIMD_STRIDE_SIZE worth of elements. - ascii_simd_unalign!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride_neither_aligned); - ascii_simd_unalign!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_neither_aligned); - ascii_simd_unalign!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_neither_aligned); - latin1_simd_unalign!(unpack_latin1, u8, u16, unpack_stride_neither_aligned); - latin1_simd_unalign!(pack_latin1, u16, u8, pack_stride_neither_aligned); - } else if #[cfg(all(feature = "simd-accel", target_endian = "little", target_feature = "neon"))] { - // SIMD with different instructions for aligned and unaligned loads and stores. - // -@@ -914,16 +1153,19 @@ cfg_if! { - // but the benchmark results I see don't agree. - - pub const SIMD_STRIDE_SIZE: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - - pub const SIMD_ALIGNMENT_MASK: usize = 15; - -+ // Safety for stride macros: We stick to the load8_aligned/etc family of functions. We consistently name -+ // aligned/unaligned functions according to src/dst being aligned/unaligned -+ - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_both_aligned, load16_aligned, store16_aligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_src_aligned, load16_aligned, store16_unaligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_dst_aligned, load16_unaligned, store16_aligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_neither_aligned, load16_unaligned, store16_unaligned); - - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_both_aligned, load16_aligned, store8_aligned); - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_src_aligned, load16_aligned, store8_unaligned); - ascii_to_basic_latin_simd_stride!(ascii_to_basic_latin_stride_dst_aligned, load16_unaligned, store8_aligned); -@@ -939,36 +1181,43 @@ cfg_if! { - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_dst_aligned, load8_unaligned, store16_aligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_neither_aligned, load8_unaligned, store16_unaligned); - - pack_simd_stride!(pack_stride_both_aligned, load8_aligned, store16_aligned); - pack_simd_stride!(pack_stride_src_aligned, load8_aligned, store16_unaligned); - pack_simd_stride!(pack_stride_dst_aligned, load8_unaligned, store16_aligned); - pack_simd_stride!(pack_stride_neither_aligned, load8_unaligned, store16_unaligned); - -+ // Safety for conversion macros: We use the correct pattern of both/src/dst/neither here. All stride functions were produced -+ // by stride macros that universally munch a single SIMD_STRIDE_SIZE worth of elements. -+ - ascii_simd_check_align!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride_both_aligned, ascii_to_ascii_stride_src_aligned, ascii_to_ascii_stride_dst_aligned, ascii_to_ascii_stride_neither_aligned); - ascii_simd_check_align!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_both_aligned, ascii_to_basic_latin_stride_src_aligned, ascii_to_basic_latin_stride_dst_aligned, ascii_to_basic_latin_stride_neither_aligned); - ascii_simd_check_align!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_both_aligned, basic_latin_to_ascii_stride_src_aligned, basic_latin_to_ascii_stride_dst_aligned, basic_latin_to_ascii_stride_neither_aligned); - latin1_simd_check_align!(unpack_latin1, u8, u16, unpack_stride_both_aligned, unpack_stride_src_aligned, unpack_stride_dst_aligned, unpack_stride_neither_aligned); - latin1_simd_check_align!(pack_latin1, u16, u8, pack_stride_both_aligned, pack_stride_src_aligned, pack_stride_dst_aligned, pack_stride_neither_aligned); - } else if #[cfg(all(feature = "simd-accel", target_feature = "sse2"))] { - // SIMD with different instructions for aligned and unaligned loads and stores. - // - // Newer microarchitectures are not supposed to have a performance difference between - // aligned and unaligned SSE2 loads and stores when the address is actually aligned, - // but the benchmark results I see don't agree. - - pub const SIMD_STRIDE_SIZE: usize = 16; - -+ /// Safety-usable invariant: This should be identical to SIMD_STRIDE_SIZE (used by ascii_simd_check_align_unrolled) - pub const SIMD_ALIGNMENT: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - - pub const SIMD_ALIGNMENT_MASK: usize = 15; - -+ // Safety for stride macros: We stick to the load8_aligned/etc family of functions. We consistently name -+ // aligned/unaligned functions according to src/dst being aligned/unaligned -+ - ascii_to_ascii_simd_double_stride!(ascii_to_ascii_simd_double_stride_both_aligned, store16_aligned); - ascii_to_ascii_simd_double_stride!(ascii_to_ascii_simd_double_stride_src_aligned, store16_unaligned); - - ascii_to_basic_latin_simd_double_stride!(ascii_to_basic_latin_simd_double_stride_both_aligned, store8_aligned); - ascii_to_basic_latin_simd_double_stride!(ascii_to_basic_latin_simd_double_stride_src_aligned, store8_unaligned); - - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_both_aligned, load16_aligned, store16_aligned); - ascii_to_ascii_simd_stride!(ascii_to_ascii_stride_src_aligned, load16_aligned, store16_unaligned); -@@ -984,33 +1233,43 @@ cfg_if! { - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_both_aligned, load8_aligned, store16_aligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_src_aligned, load8_aligned, store16_unaligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_dst_aligned, load8_unaligned, store16_aligned); - basic_latin_to_ascii_simd_stride!(basic_latin_to_ascii_stride_neither_aligned, load8_unaligned, store16_unaligned); - - pack_simd_stride!(pack_stride_both_aligned, load8_aligned, store16_aligned); - pack_simd_stride!(pack_stride_src_aligned, load8_aligned, store16_unaligned); - -+ // Safety for conversion macros: We use the correct pattern of both/src/dst/neither/double_both/double_src here. All stride functions were produced -+ // by stride macros that universally munch a single SIMD_STRIDE_SIZE worth of elements. -+ - ascii_simd_check_align_unrolled!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride_both_aligned, ascii_to_ascii_stride_src_aligned, ascii_to_ascii_stride_neither_aligned, ascii_to_ascii_simd_double_stride_both_aligned, ascii_to_ascii_simd_double_stride_src_aligned); - ascii_simd_check_align_unrolled!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_both_aligned, ascii_to_basic_latin_stride_src_aligned, ascii_to_basic_latin_stride_neither_aligned, ascii_to_basic_latin_simd_double_stride_both_aligned, ascii_to_basic_latin_simd_double_stride_src_aligned); - - ascii_simd_check_align!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_both_aligned, basic_latin_to_ascii_stride_src_aligned, basic_latin_to_ascii_stride_dst_aligned, basic_latin_to_ascii_stride_neither_aligned); - latin1_simd_check_align_unrolled!(unpack_latin1, u8, u16, unpack_stride_both_aligned, unpack_stride_src_aligned, unpack_stride_dst_aligned, unpack_stride_neither_aligned); - latin1_simd_check_align_unrolled!(pack_latin1, u16, u8, pack_stride_both_aligned, pack_stride_src_aligned, pack_stride_dst_aligned, pack_stride_neither_aligned); - } else if #[cfg(all(target_endian = "little", target_pointer_width = "64"))] { - // Aligned ALU word, little-endian, 64-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 8; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 7; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0x0000_0000_FF00_0000usize & word) << 24) | - ((0x0000_0000_00FF_0000usize & word) << 16) | - ((0x0000_0000_0000_FF00usize & word) << 8) | - (0x0000_0000_0000_00FFusize & word); - let second = ((0xFF00_0000_0000_0000usize & word) >> 8) | - ((0x00FF_0000_0000_0000usize & word) >> 16) | -@@ -1019,22 +1278,24 @@ cfg_if! { - let third = ((0x0000_0000_FF00_0000usize & second_word) << 24) | - ((0x0000_0000_00FF_0000usize & second_word) << 16) | - ((0x0000_0000_0000_FF00usize & second_word) << 8) | - (0x0000_0000_0000_00FFusize & second_word); - let fourth = ((0xFF00_0000_0000_0000usize & second_word) >> 8) | - ((0x00FF_0000_0000_0000usize & second_word) >> 16) | - ((0x0000_FF00_0000_0000usize & second_word) >> 24) | - ((0x0000_00FF_0000_0000usize & second_word) >> 32); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF_0000_0000_0000usize & second) << 8) | - ((0x0000_00FF_0000_0000usize & second) << 16) | - ((0x0000_0000_00FF_0000usize & second) << 24) | - ((0x0000_0000_0000_00FFusize & second) << 32) | - ((0x00FF_0000_0000_0000usize & first) >> 24) | - ((0x0000_00FF_0000_0000usize & first) >> 16) | -@@ -1043,70 +1304,88 @@ cfg_if! { - let second_word = ((0x00FF_0000_0000_0000usize & fourth) << 8) | - ((0x0000_00FF_0000_0000usize & fourth) << 16) | - ((0x0000_0000_00FF_0000usize & fourth) << 24) | - ((0x0000_0000_0000_00FFusize & fourth) << 32) | - ((0x00FF_0000_0000_0000usize & third) >> 24) | - ((0x0000_00FF_0000_0000usize & third) >> 16) | - ((0x0000_0000_00FF_0000usize & third) >> 8) | - (0x0000_0000_0000_00FFusize & third); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else if #[cfg(all(target_endian = "little", target_pointer_width = "32"))] { - // Aligned ALU word, little-endian, 32-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 8; - - pub const MAX_STRIDE_SIZE: usize = 8; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 4; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 3; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0x0000_FF00usize & word) << 8) | - (0x0000_00FFusize & word); - let second = ((0xFF00_0000usize & word) >> 8) | - ((0x00FF_0000usize & word) >> 16); - let third = ((0x0000_FF00usize & second_word) << 8) | - (0x0000_00FFusize & second_word); - let fourth = ((0xFF00_0000usize & second_word) >> 8) | - ((0x00FF_0000usize & second_word) >> 16); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF_0000usize & second) << 8) | - ((0x0000_00FFusize & second) << 16) | - ((0x00FF_0000usize & first) >> 8) | - (0x0000_00FFusize & first); - let second_word = ((0x00FF_0000usize & fourth) << 8) | - ((0x0000_00FFusize & fourth) << 16) | - ((0x00FF_0000usize & third) >> 8) | - (0x0000_00FFusize & third); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else if #[cfg(all(target_endian = "big", target_pointer_width = "64"))] { - // Aligned ALU word, big-endian, 64-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 16; - - pub const MAX_STRIDE_SIZE: usize = 16; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 8; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 7; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0xFF00_0000_0000_0000usize & word) >> 8) | - ((0x00FF_0000_0000_0000usize & word) >> 16) | - ((0x0000_FF00_0000_0000usize & word) >> 24) | - ((0x0000_00FF_0000_0000usize & word) >> 32); - let second = ((0x0000_0000_FF00_0000usize & word) << 24) | - ((0x0000_0000_00FF_0000usize & word) << 16) | -@@ -1115,22 +1394,24 @@ cfg_if! { - let third = ((0xFF00_0000_0000_0000usize & second_word) >> 8) | - ((0x00FF_0000_0000_0000usize & second_word) >> 16) | - ((0x0000_FF00_0000_0000usize & second_word) >> 24) | - ((0x0000_00FF_0000_0000usize & second_word) >> 32); - let fourth = ((0x0000_0000_FF00_0000usize & second_word) << 24) | - ((0x0000_0000_00FF_0000usize & second_word) << 16) | - ((0x0000_0000_0000_FF00usize & second_word) << 8) | - (0x0000_0000_0000_00FFusize & second_word); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF0000_00000000usize & first) << 8) | - ((0x000000FF_00000000usize & first) << 16) | - ((0x00000000_00FF0000usize & first) << 24) | - ((0x00000000_000000FFusize & first) << 32) | - ((0x00FF0000_00000000usize & second) >> 24) | - ((0x000000FF_00000000usize & second) >> 16) | -@@ -1139,67 +1420,80 @@ cfg_if! { - let second_word = ((0x00FF0000_00000000usize & third) << 8) | - ((0x000000FF_00000000usize & third) << 16) | - ((0x00000000_00FF0000usize & third) << 24) | - ((0x00000000_000000FFusize & third) << 32) | - ((0x00FF0000_00000000usize & fourth) >> 24) | - ((0x000000FF_00000000usize & fourth) >> 16) | - ((0x00000000_00FF0000usize & fourth) >> 8) | - (0x00000000_000000FFusize & fourth); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else if #[cfg(all(target_endian = "big", target_pointer_width = "32"))] { - // Aligned ALU word, big-endian, 32-bit - -+ /// Safety invariant: this is the amount of bytes consumed by -+ /// unpack_alu. This will be twice the pointer width, as it consumes two usizes. -+ /// This is also the number of bytes produced by pack_alu. -+ /// This is also the number of u16 code units produced/consumed by unpack_alu/pack_alu respectively. - pub const ALU_STRIDE_SIZE: usize = 8; - - pub const MAX_STRIDE_SIZE: usize = 8; - -+ // Safety invariant: this is the pointer width in bytes - pub const ALU_ALIGNMENT: usize = 4; - -+ // Safety invariant: this is a mask for getting the bits of a pointer not aligned to ALU_ALIGNMENT - pub const ALU_ALIGNMENT_MASK: usize = 3; - -+ /// Safety: dst must point to valid space for writing four `usize`s - #[inline(always)] - unsafe fn unpack_alu(word: usize, second_word: usize, dst: *mut usize) { - let first = ((0xFF00_0000usize & word) >> 8) | - ((0x00FF_0000usize & word) >> 16); - let second = ((0x0000_FF00usize & word) << 8) | - (0x0000_00FFusize & word); - let third = ((0xFF00_0000usize & second_word) >> 8) | - ((0x00FF_0000usize & second_word) >> 16); - let fourth = ((0x0000_FF00usize & second_word) << 8) | - (0x0000_00FFusize & second_word); -+ // Safety: fn invariant used here - *dst = first; - *(dst.add(1)) = second; - *(dst.add(2)) = third; - *(dst.add(3)) = fourth; - } - -+ /// Safety: dst must point to valid space for writing two `usize`s - #[inline(always)] - unsafe fn pack_alu(first: usize, second: usize, third: usize, fourth: usize, dst: *mut usize) { - let word = ((0x00FF_0000usize & first) << 8) | - ((0x0000_00FFusize & first) << 16) | - ((0x00FF_0000usize & second) >> 8) | - (0x0000_00FFusize & second); - let second_word = ((0x00FF_0000usize & third) << 8) | - ((0x0000_00FFusize & third) << 16) | - ((0x00FF_0000usize & fourth) >> 8) | - (0x0000_00FFusize & fourth); -+ // Safety: fn invariant used here - *dst = word; - *(dst.add(1)) = second_word; - } - } else { - ascii_naive!(ascii_to_ascii, u8, u8); - ascii_naive!(ascii_to_basic_latin, u8, u16); - ascii_naive!(basic_latin_to_ascii, u16, u8); - } - } - - cfg_if! { -+ // Safety-usable invariant: this counts the zeroes from the "first byte" of utf-8 data packed into a usize -+ // with the target endianness - if #[cfg(target_endian = "little")] { - #[allow(dead_code)] - #[inline(always)] - fn count_zeros(word: usize) -> u32 { - word.trailing_zeros() - } - } else { - #[allow(dead_code)] -@@ -1207,208 +1501,272 @@ cfg_if! { - fn count_zeros(word: usize) -> u32 { - word.leading_zeros() - } - } - } - - cfg_if! { - if #[cfg(all(feature = "simd-accel", target_endian = "little", target_arch = "disabled"))] { -+ /// Safety-usable invariant: Will return the value and position of the first non-ASCII byte in the slice in a Some if found. -+ /// In other words, the first element of the Some is always `> 127` - #[inline(always)] - pub fn validate_ascii(slice: &[u8]) -> Option<(u8, usize)> { - let src = slice.as_ptr(); - let len = slice.len(); - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading/writing at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { -+ // Safety: src at offset is valid for a `SIMD_STRIDE_SIZE` read - let simd = unsafe { load16_unaligned(src.add(offset)) }; - if !simd_is_ascii(simd) { - break; - } - offset += SIMD_STRIDE_SIZE; -+ // This is `offset > len - SIMD_STRIDE_SIZE` which means we always have at least `SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { - let code_unit = slice[offset]; - if code_unit > 127 { -+ // Safety: Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - offset += 1; - } - None - } - } else if #[cfg(all(feature = "simd-accel", target_feature = "sse2"))] { -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[inline(always)] - pub fn validate_ascii(slice: &[u8]) -> Option<(u8, usize)> { - let src = slice.as_ptr(); - let len = slice.len(); - let mut offset = 0usize; -+ // Safety: if this check succeeds we're valid for reading at least `stride` elements. - if SIMD_STRIDE_SIZE <= len { - // First, process one unaligned vector -+ // Safety: src is valid for a `SIMD_STRIDE_SIZE` read - let simd = unsafe { load16_unaligned(src) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset = mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; - return Some((non_ascii, offset)); - } - offset = SIMD_STRIDE_SIZE; -+ // Safety: Now that offset has changed we don't yet know how much it is valid for - - // We have now seen 16 ASCII bytes. Let's guess that - // there will be enough more to justify more expense - // in the case of non-ASCII. - // Use aligned reads for the sake of old microachitectures. -+ // Safety: this correctly calculates the number of src_units that need to be read before the remaining list is aligned. -+ // This is by definition less than SIMD_ALIGNMENT, which is defined to be equal to SIMD_STRIDE_SIZE. - let until_alignment = unsafe { (SIMD_ALIGNMENT - ((src.add(offset) as usize) & SIMD_ALIGNMENT_MASK)) & SIMD_ALIGNMENT_MASK }; - // This addition won't overflow, because even in the 32-bit PAE case the - // address space holds enough code that the slice length can't be that - // close to address space size. - // offset now equals SIMD_STRIDE_SIZE, hence times 3 below. -+ // -+ // Safety: if this check succeeds we're valid for reading at least `2 * SIMD_STRIDE_SIZE` elements plus `until_alignment`. -+ // The extra SIMD_STRIDE_SIZE in the condition is because `offset` is already `SIMD_STRIDE_SIZE`. - if until_alignment + (SIMD_STRIDE_SIZE * 3) <= len { - if until_alignment != 0 { -+ // Safety: this is safe to call since we're valid for this read (and more), and don't care about alignment -+ // This will copy over bytes that get decoded twice since it's not incrementing `offset` by SIMD_STRIDE_SIZE. This is fine. - let simd = unsafe { load16_unaligned(src.add(offset)) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; - return Some((non_ascii, offset)); - } - offset += until_alignment; - } -+ // Safety: At this point we're valid for reading 2*SIMD_STRIDE_SIZE elements -+ // Safety: Now `offset` is aligned for `src` - let len_minus_stride_times_two = len - (SIMD_STRIDE_SIZE * 2); - loop { -+ // Safety: We were valid for this read, and were aligned. - let first = unsafe { load16_aligned(src.add(offset)) }; - let second = unsafe { load16_aligned(src.add(offset + SIMD_STRIDE_SIZE)) }; - if !simd_is_ascii(first | second) { -+ // Safety: mask_ascii produces a mask of all the high bits. - let mask_first = mask_ascii(first); - if mask_first != 0 { -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src -+ // TODO SAFETY: What about big-endian systems? - offset += mask_first.trailing_zeros() as usize; - } else { - let mask_second = mask_ascii(second); -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src - offset += SIMD_STRIDE_SIZE + mask_second.trailing_zeros() as usize; - } -+ // Safety: We know this is non-ASCII, and can uphold the safety-usable invariant here - let non_ascii = unsafe { *src.add(offset) }; -+ - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE * 2; -+ // Safety: This is `offset > len - 2 * SIMD_STRIDE_SIZE` which means we always have at least `2 * SIMD_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride_times_two { - break; - } - } -+ // Safety: if this check succeeds we're valid for reading at least `SIMD_STRIDE_SIZE` - if offset + SIMD_STRIDE_SIZE <= len { -- let simd = unsafe { load16_aligned(src.add(offset)) }; -- let mask = mask_ascii(simd); -+ // Safety: We were valid for this read, and were aligned. -+ let simd = unsafe { load16_aligned(src.add(offset)) }; -+ // Safety: mask_ascii produces a mask of all the high bits. -+ let mask = mask_ascii(simd); - if mask != 0 { -+ // Safety: on little endian systems this will be the number of ascii bytes -+ // before the first non-ascii, i.e. valid for indexing src - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; -+ // Safety: We know this is non-ASCII, and can uphold the safety-usable invariant here - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE; - } - } else { -+ // Safety: this is the unaligned branch - // At most two iterations, so unroll -+ // Safety: if this check succeeds we're valid for reading at least `SIMD_STRIDE_SIZE` - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: We're valid for this read but must use an unaligned read - let simd = unsafe { load16_unaligned(src.add(offset)) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; -+ // Safety-usable invariant upheld here (same as above) - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: if this check succeeds we're valid for reading at least `SIMD_STRIDE_SIZE` - if offset + SIMD_STRIDE_SIZE <= len { -+ // Safety: We're valid for this read but must use an unaligned read - let simd = unsafe { load16_unaligned(src.add(offset)) }; - let mask = mask_ascii(simd); - if mask != 0 { - offset += mask.trailing_zeros() as usize; - let non_ascii = unsafe { *src.add(offset) }; -+ // Safety-usable invariant upheld here (same as above) - return Some((non_ascii, offset)); - } - offset += SIMD_STRIDE_SIZE; - } - } - } - } - while offset < len { -+ // Safety: relies straightforwardly on the `len` invariant - let code_unit = unsafe { *(src.add(offset)) }; - if code_unit > 127 { -+ // Safety-usable invariant upheld here - return Some((code_unit, offset)); - } - offset += 1; - } - None - } - } else { -+ // Safety-usable invariant: returns byte index of first non-ascii byte - #[inline(always)] - fn find_non_ascii(word: usize, second_word: usize) -> Option<usize> { - let word_masked = word & ASCII_MASK; - let second_masked = second_word & ASCII_MASK; - if (word_masked | second_masked) == 0 { -+ // Both are ascii, invariant upheld - return None; - } - if word_masked != 0 { - let zeros = count_zeros(word_masked); -- // `zeros` now contains 7 (for the seven bits of non-ASCII) -+ // `zeros` now contains 0 to 7 (for the seven bits of masked ASCII in little endian, -+ // or up to 7 bits of non-ASCII in big endian if the first byte is non-ASCII) - // plus 8 times the number of ASCII in text order before the - // non-ASCII byte in the little-endian case or 8 times the number of ASCII in - // text order before the non-ASCII byte in the big-endian case. - let num_ascii = (zeros >> 3) as usize; -+ // Safety-usable invariant upheld here - return Some(num_ascii); - } - let zeros = count_zeros(second_masked); -- // `zeros` now contains 7 (for the seven bits of non-ASCII) -+ // `zeros` now contains 0 to 7 (for the seven bits of masked ASCII in little endian, -+ // or up to 7 bits of non-ASCII in big endian if the first byte is non-ASCII) - // plus 8 times the number of ASCII in text order before the - // non-ASCII byte in the little-endian case or 8 times the number of ASCII in - // text order before the non-ASCII byte in the big-endian case. - let num_ascii = (zeros >> 3) as usize; -+ // Safety-usable invariant upheld here - Some(ALU_ALIGNMENT + num_ascii) - } - -+ /// Safety: `src` must be valid for the reads of two `usize`s -+ /// -+ /// Safety-usable invariant: will return byte index of first non-ascii byte - #[inline(always)] - unsafe fn validate_ascii_stride(src: *const usize) -> Option<usize> { - let word = *src; - let second_word = *(src.add(1)); - find_non_ascii(word, second_word) - } - -+ /// Safety-usable invariant: will return Some() when it encounters non-ASCII, with the first element in the Some being -+ /// guaranteed to be non-ASCII (> 127), and the second being the offset where it is found - #[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))] - #[inline(always)] - pub fn validate_ascii(slice: &[u8]) -> Option<(u8, usize)> { - let src = slice.as_ptr(); - let len = slice.len(); - let mut offset = 0usize; - let mut until_alignment = (ALU_ALIGNMENT - ((src as usize) & ALU_ALIGNMENT_MASK)) & ALU_ALIGNMENT_MASK; -+ // Safety: If this check fails we're valid to read `until_alignment + ALU_STRIDE_SIZE` elements - if until_alignment + ALU_STRIDE_SIZE <= len { - while until_alignment != 0 { - let code_unit = slice[offset]; - if code_unit > 127 { -+ // Safety-usable invairant upheld here - return Some((code_unit, offset)); - } - offset += 1; - until_alignment -= 1; - } -+ // Safety: At this point we have read until_alignment elements and -+ // are valid for `ALU_STRIDE_SIZE` more. - let len_minus_stride = len - ALU_STRIDE_SIZE; - loop { -+ // Safety: we were valid for this read - let ptr = unsafe { src.add(offset) as *const usize }; - if let Some(num_ascii) = unsafe { validate_ascii_stride(ptr) } { - offset += num_ascii; -+ // Safety-usable invairant upheld here using the invariant from validate_ascii_stride() - return Some((unsafe { *(src.add(offset)) }, offset)); - } - offset += ALU_STRIDE_SIZE; -+ // Safety: This is `offset > ALU_STRIDE_SIZE` which means we always have at least `2 * ALU_STRIDE_SIZE` elements to munch next time. - if offset > len_minus_stride { - break; - } - } - } - while offset < len { - let code_unit = slice[offset]; - if code_unit > 127 { -+ // Safety-usable invairant upheld here - return Some((code_unit, offset)); - } - offset += 1; - } - None - } - - } -@@ -1423,70 +1781,88 @@ cfg_if! { - // vector reads without vector writes. - - pub const ALU_STRIDE_SIZE: usize = 8; - - pub const ALU_ALIGNMENT: usize = 4; - - pub const ALU_ALIGNMENT_MASK: usize = 3; - } else { -+ // Safety: src points to two valid `usize`s, dst points to four valid `usize`s - #[inline(always)] - unsafe fn unpack_latin1_stride_alu(src: *const usize, dst: *mut usize) { -+ // Safety: src safety invariant used here - let word = *src; - let second_word = *(src.add(1)); -+ // Safety: dst safety invariant passed down - unpack_alu(word, second_word, dst); - } - -+ // Safety: src points to four valid `usize`s, dst points to two valid `usize`s - #[inline(always)] - unsafe fn pack_latin1_stride_alu(src: *const usize, dst: *mut usize) { -+ // Safety: src safety invariant used here - let first = *src; - let second = *(src.add(1)); - let third = *(src.add(2)); - let fourth = *(src.add(3)); -+ // Safety: dst safety invariant passed down - pack_alu(first, second, third, fourth, dst); - } - -+ // Safety: src points to two valid `usize`s, dst points to four valid `usize`s - #[inline(always)] - unsafe fn ascii_to_basic_latin_stride_alu(src: *const usize, dst: *mut usize) -> bool { -+ // Safety: src safety invariant used here - let word = *src; - let second_word = *(src.add(1)); - // Check if the words contains non-ASCII - if (word & ASCII_MASK) | (second_word & ASCII_MASK) != 0 { - return false; - } -+ // Safety: dst safety invariant passed down - unpack_alu(word, second_word, dst); - true - } - -+ // Safety: src points four valid `usize`s, dst points to two valid `usize`s - #[inline(always)] - unsafe fn basic_latin_to_ascii_stride_alu(src: *const usize, dst: *mut usize) -> bool { -+ // Safety: src safety invariant used here - let first = *src; - let second = *(src.add(1)); - let third = *(src.add(2)); - let fourth = *(src.add(3)); - if (first & BASIC_LATIN_MASK) | (second & BASIC_LATIN_MASK) | (third & BASIC_LATIN_MASK) | (fourth & BASIC_LATIN_MASK) != 0 { - return false; - } -+ // Safety: dst safety invariant passed down - pack_alu(first, second, third, fourth, dst); - true - } - -+ // Safety: src, dst both point to two valid `usize`s each -+ // Safety-usable invariant: Will return byte index of first non-ascii byte. - #[inline(always)] - unsafe fn ascii_to_ascii_stride(src: *const usize, dst: *mut usize) -> Option<usize> { -+ // Safety: src safety invariant used here - let word = *src; - let second_word = *(src.add(1)); -+ // Safety: src safety invariant used here - *dst = word; - *(dst.add(1)) = second_word; -+ // Relies on safety-usable invariant here - find_non_ascii(word, second_word) - } - - basic_latin_alu!(ascii_to_basic_latin, u8, u16, ascii_to_basic_latin_stride_alu); - basic_latin_alu!(basic_latin_to_ascii, u16, u8, basic_latin_to_ascii_stride_alu); - latin1_alu!(unpack_latin1, u8, u16, unpack_latin1_stride_alu); - latin1_alu!(pack_latin1, u16, u8, pack_latin1_stride_alu); -+ // Safety invariant upheld: ascii_to_ascii_stride will return byte index of first non-ascii if found - ascii_alu!(ascii_to_ascii, u8, u8, ascii_to_ascii_stride); - } - } - - pub fn ascii_valid_up_to(bytes: &[u8]) -> usize { - match validate_ascii(bytes) { - None => bytes.len(), - Some((_, num_valid)) => num_valid, -diff --git a/third_party/rust/encoding_rs/src/handles.rs b/third_party/rust/encoding_rs/src/handles.rs ---- third_party/rust/encoding_rs/src/handles.rs -+++ third_party/rust/encoding_rs/src/handles.rs -@@ -29,17 +29,17 @@ use crate::simd_funcs::*; - #[cfg(all( - feature = "simd-accel", - any( - target_feature = "sse2", - all(target_endian = "little", target_arch = "aarch64"), - all(target_endian = "little", target_feature = "neon") - ) - ))] --use packed_simd::u16x8; -+use core::simd::u16x8; - - use super::DecoderResult; - use super::EncoderResult; - use crate::ascii::*; - use crate::utf_8::convert_utf8_to_utf16_up_to_invalid; - use crate::utf_8::utf8_valid_up_to; - - pub enum Space<T> { -@@ -85,84 +85,100 @@ impl Endian for LittleEndian { - const OPPOSITE_ENDIAN: bool = false; - - #[cfg(target_endian = "big")] - const OPPOSITE_ENDIAN: bool = true; - } - - #[derive(Debug, Copy, Clone)] - struct UnalignedU16Slice { -+ // Safety invariant: ptr must be valid for reading 2*len bytes - ptr: *const u8, - len: usize, - } - - impl UnalignedU16Slice { -+ /// Safety: ptr must be valid for reading 2*len bytes - #[inline(always)] - pub unsafe fn new(ptr: *const u8, len: usize) -> UnalignedU16Slice { -+ // Safety: field invariant passed up to caller here - UnalignedU16Slice { ptr, len } - } - - #[inline(always)] - pub fn trim_last(&mut self) { - assert!(self.len > 0); -+ // Safety: invariant upheld here: a slice is still valid with a shorter len - self.len -= 1; - } - - #[inline(always)] - pub fn at(&self, i: usize) -> u16 { - use core::mem::MaybeUninit; - - assert!(i < self.len); - unsafe { - let mut u: MaybeUninit<u16> = MaybeUninit::uninit(); -+ // Safety: i is at most len - 1, which works here - ::core::ptr::copy_nonoverlapping(self.ptr.add(i * 2), u.as_mut_ptr() as *mut u8, 2); -+ // Safety: valid read above lets us do this - u.assume_init() - } - } - - #[cfg(feature = "simd-accel")] - #[inline(always)] - pub fn simd_at(&self, i: usize) -> u16x8 { -+ // Safety: i/len are on the scale of u16s, each one corresponds to 2 u8s - assert!(i + SIMD_STRIDE_SIZE / 2 <= self.len); - let byte_index = i * 2; -+ // Safety: load16_unaligned needs SIMD_STRIDE_SIZE=16 u8 elements to read, -+ // or 16/2 = 8 u16 elements to read. -+ // We have checked that we have at least that many above. -+ - unsafe { to_u16_lanes(load16_unaligned(self.ptr.add(byte_index))) } - } - - #[inline(always)] - pub fn len(&self) -> usize { - self.len - } - - #[inline(always)] - pub fn tail(&self, from: usize) -> UnalignedU16Slice { - // XXX the return value should be restricted not to - // outlive self. - assert!(from <= self.len); -+ // Safety: This upholds the same invariant: `from` is in bounds and we're returning a shorter slice - unsafe { UnalignedU16Slice::new(self.ptr.add(from * 2), self.len - from) } - } - - #[cfg(feature = "simd-accel")] - #[inline(always)] - pub fn copy_bmp_to<E: Endian>(&self, other: &mut [u16]) -> Option<(u16, usize)> { - assert!(self.len <= other.len()); - let mut offset = 0; -+ // Safety: SIMD_STRIDE_SIZE is measured in bytes, whereas len is in u16s. We check we can -+ // munch SIMD_STRIDE_SIZE / 2 u16s which means we can write SIMD_STRIDE_SIZE u8s - if SIMD_STRIDE_SIZE / 2 <= self.len { - let len_minus_stride = self.len - SIMD_STRIDE_SIZE / 2; - loop { - let mut simd = self.simd_at(offset); - if E::OPPOSITE_ENDIAN { - simd = simd_byte_swap(simd); - } -+ // Safety: we have enough space on the other side to write this - unsafe { - store8_unaligned(other.as_mut_ptr().add(offset), simd); - } - if contains_surrogates(simd) { - break; - } - offset += SIMD_STRIDE_SIZE / 2; -+ // Safety: This ensures we still have space for writing SIMD_STRIDE_SIZE u8s - if offset > len_minus_stride { - break; - } - } - } - while offset < self.len { - let unit = swap_if_opposite_endian::<E>(self.at(offset)); - other[offset] = unit; -@@ -231,33 +247,37 @@ fn copy_unaligned_basic_latin_to_ascii<E - #[cfg(feature = "simd-accel")] - #[inline(always)] - fn copy_unaligned_basic_latin_to_ascii<E: Endian>( - src: UnalignedU16Slice, - dst: &mut [u8], - ) -> CopyAsciiResult<usize, (u16, usize)> { - let len = ::core::cmp::min(src.len(), dst.len()); - let mut offset = 0; -+ // Safety: This check ensures we are able to read/write at least SIMD_STRIDE_SIZE elements - if SIMD_STRIDE_SIZE <= len { - let len_minus_stride = len - SIMD_STRIDE_SIZE; - loop { - let mut first = src.simd_at(offset); - let mut second = src.simd_at(offset + (SIMD_STRIDE_SIZE / 2)); - if E::OPPOSITE_ENDIAN { - first = simd_byte_swap(first); - second = simd_byte_swap(second); - } - if !simd_is_basic_latin(first | second) { - break; - } - let packed = simd_pack(first, second); -+ // Safety: We are able to write SIMD_STRIDE_SIZE elements in this iteration - unsafe { - store16_unaligned(dst.as_mut_ptr().add(offset), packed); - } - offset += SIMD_STRIDE_SIZE; -+ // Safety: This is `offset > len - SIMD_STRIDE_SIZE`, which ensures that we can write at least SIMD_STRIDE_SIZE elements -+ // in the next iteration - if offset > len_minus_stride { - break; - } - } - } - copy_unaligned_basic_latin_to_ascii_alu::<E>(src.tail(offset), &mut dst[offset..], offset) - } - -@@ -632,94 +652,106 @@ impl<'a> Utf16Destination<'a> { - #[inline(always)] - fn write_astral(&mut self, astral: u32) { - debug_assert!(astral > 0xFFFF); - debug_assert!(astral <= 0x10_FFFF); - self.write_code_unit((0xD7C0 + (astral >> 10)) as u16); - self.write_code_unit((0xDC00 + (astral & 0x3FF)) as u16); - } - #[inline(always)] -- pub fn write_surrogate_pair(&mut self, high: u16, low: u16) { -+ fn write_surrogate_pair(&mut self, high: u16, low: u16) { - self.write_code_unit(high); - self.write_code_unit(low); - } - #[inline(always)] - fn write_big5_combination(&mut self, combined: u16, combining: u16) { - self.write_bmp_excl_ascii(combined); - self.write_bmp_excl_ascii(combining); - } -+ // Safety-usable invariant: CopyAsciiResult::GoOn will only contain bytes >=0x80 - #[inline(always)] - pub fn copy_ascii_from_check_space_bmp<'b>( - &'b mut self, - source: &mut ByteSource, - ) -> CopyAsciiResult<(DecoderResult, usize, usize), (u8, Utf16BmpHandle<'b, 'a>)> { - let non_ascii_ret = { - let src_remaining = &source.slice[source.pos..]; - let dst_remaining = &mut self.slice[self.pos..]; - let (pending, length) = if dst_remaining.len() < src_remaining.len() { - (DecoderResult::OutputFull, dst_remaining.len()) - } else { - (DecoderResult::InputEmpty, src_remaining.len()) - }; -+ // Safety: This function is documented as needing valid pointers for src/dest and len, which -+ // is true since we've passed the minumum length of the two - match unsafe { - ascii_to_basic_latin(src_remaining.as_ptr(), dst_remaining.as_mut_ptr(), length) - } { - None => { - source.pos += length; - self.pos += length; - return CopyAsciiResult::Stop((pending, source.pos, self.pos)); - } -+ // Safety: the function is documented as returning bytes >=0x80 in the Some - Some((non_ascii, consumed)) => { - source.pos += consumed; - self.pos += consumed; - source.pos += 1; // +1 for non_ascii -+ // Safety: non-ascii bubbled out here - non_ascii - } - } - }; -+ // Safety: non-ascii returned here - CopyAsciiResult::GoOn((non_ascii_ret, Utf16BmpHandle::new(self))) - } -+ // Safety-usable invariant: CopyAsciiResult::GoOn will only contain bytes >=0x80 - #[inline(always)] - pub fn copy_ascii_from_check_space_astral<'b>( - &'b mut self, - source: &mut ByteSource, - ) -> CopyAsciiResult<(DecoderResult, usize, usize), (u8, Utf16AstralHandle<'b, 'a>)> { - let non_ascii_ret = { - let dst_len = self.slice.len(); - let src_remaining = &source.slice[source.pos..]; - let dst_remaining = &mut self.slice[self.pos..]; - let (pending, length) = if dst_remaining.len() < src_remaining.len() { - (DecoderResult::OutputFull, dst_remaining.len()) - } else { - (DecoderResult::InputEmpty, src_remaining.len()) - }; -+ // Safety: This function is documented as needing valid pointers for src/dest and len, which -+ // is true since we've passed the minumum length of the two - match unsafe { - ascii_to_basic_latin(src_remaining.as_ptr(), dst_remaining.as_mut_ptr(), length) - } { - None => { - source.pos += length; - self.pos += length; - return CopyAsciiResult::Stop((pending, source.pos, self.pos)); - } -+ // Safety: the function is documented as returning bytes >=0x80 in the Some - Some((non_ascii, consumed)) => { - source.pos += consumed; - self.pos += consumed; - if self.pos + 1 < dst_len { - source.pos += 1; // +1 for non_ascii -+ // Safety: non-ascii bubbled out here - non_ascii - } else { - return CopyAsciiResult::Stop(( - DecoderResult::OutputFull, - source.pos, - self.pos, - )); - } - } - } - }; -+ // Safety: non-ascii returned here - CopyAsciiResult::GoOn((non_ascii_ret, Utf16AstralHandle::new(self))) - } - #[inline(always)] - pub fn copy_utf8_up_to_invalid_from(&mut self, source: &mut ByteSource) { - let src_remaining = &source.slice[source.pos..]; - let dst_remaining = &mut self.slice[self.pos..]; - let (read, written) = convert_utf8_to_utf16_up_to_invalid(src_remaining, dst_remaining); - source.pos += read; -diff --git a/third_party/rust/encoding_rs/src/lib.rs b/third_party/rust/encoding_rs/src/lib.rs ---- third_party/rust/encoding_rs/src/lib.rs -+++ third_party/rust/encoding_rs/src/lib.rs -@@ -684,37 +684,26 @@ - //! <tr><td>TIS-620</td><td>windows-874</td></tr> - //! </tbody> - //! </table> - //! - //! See the section [_UTF-16LE, UTF-16BE and Unicode Encoding Schemes_](#utf-16le-utf-16be-and-unicode-encoding-schemes) - //! for discussion about the UTF-16 family. - - #![no_std] --#![cfg_attr(feature = "simd-accel", feature(core_intrinsics))] -+#![cfg_attr(feature = "simd-accel", feature(core_intrinsics, portable_simd))] - - #[cfg(feature = "alloc")] - #[cfg_attr(test, macro_use)] - extern crate alloc; - - extern crate core; - #[macro_use] - extern crate cfg_if; - --#[cfg(all( -- feature = "simd-accel", -- any( -- target_feature = "sse2", -- all(target_endian = "little", target_arch = "aarch64"), -- all(target_endian = "little", target_feature = "neon") -- ) --))] --#[macro_use(shuffle)] --extern crate packed_simd; -- - #[cfg(feature = "serde")] - extern crate serde; - - #[cfg(all(test, feature = "serde"))] - extern crate bincode; - #[cfg(all(test, feature = "serde"))] - #[macro_use] - extern crate serde_derive; -diff --git a/third_party/rust/encoding_rs/src/mem.rs b/third_party/rust/encoding_rs/src/mem.rs ---- third_party/rust/encoding_rs/src/mem.rs -+++ third_party/rust/encoding_rs/src/mem.rs -@@ -111,16 +111,21 @@ macro_rules! by_unit_check_alu { - until_alignment -= 1; - } - if accu >= $bound { - return false; - } - } - let len_minus_stride = len - ALU_ALIGNMENT / unit_size; - if offset + (4 * (ALU_ALIGNMENT / unit_size)) <= len { -+ // Safety: the above check lets us perform 4 consecutive reads of -+ // length ALU_ALIGNMENT / unit_size. ALU_ALIGNMENT is the size of usize, and unit_size -+ // is the size of the `src` pointer, so this is equal to performing four usize reads. -+ // -+ // This invariant is upheld on all loop iterations - let len_minus_unroll = len - (4 * (ALU_ALIGNMENT / unit_size)); - loop { - let unroll_accu = unsafe { *(src.add(offset) as *const usize) } - | unsafe { - *(src.add(offset + (ALU_ALIGNMENT / unit_size)) as *const usize) - } - | unsafe { - *(src.add(offset + (2 * (ALU_ALIGNMENT / unit_size))) -@@ -129,22 +134,24 @@ macro_rules! by_unit_check_alu { - | unsafe { - *(src.add(offset + (3 * (ALU_ALIGNMENT / unit_size))) - as *const usize) - }; - if unroll_accu & $mask != 0 { - return false; - } - offset += 4 * (ALU_ALIGNMENT / unit_size); -+ // Safety: this check lets us continue to perform the 4 reads earlier - if offset > len_minus_unroll { - break; - } - } - } - while offset <= len_minus_stride { -+ // Safety: the above check lets us perform one usize read. - accu |= unsafe { *(src.add(offset) as *const usize) }; - offset += ALU_ALIGNMENT / unit_size; - } - } - } - for &unit in &buffer[offset..] { - accu |= unit as usize; - } -@@ -184,16 +191,21 @@ macro_rules! by_unit_check_simd { - until_alignment -= 1; - } - if accu >= $bound { - return false; - } - } - let len_minus_stride = len - SIMD_STRIDE_SIZE / unit_size; - if offset + (4 * (SIMD_STRIDE_SIZE / unit_size)) <= len { -+ // Safety: the above check lets us perform 4 consecutive reads of -+ // length SIMD_STRIDE_SIZE / unit_size. SIMD_STRIDE_SIZE is the size of $simd_ty, and unit_size -+ // is the size of the `src` pointer, so this is equal to performing four $simd_ty reads. -+ // -+ // This invariant is upheld on all loop iterations - let len_minus_unroll = len - (4 * (SIMD_STRIDE_SIZE / unit_size)); - loop { - let unroll_accu = unsafe { *(src.add(offset) as *const $simd_ty) } - | unsafe { - *(src.add(offset + (SIMD_STRIDE_SIZE / unit_size)) - as *const $simd_ty) - } - | unsafe { -@@ -203,23 +215,25 @@ macro_rules! by_unit_check_simd { - | unsafe { - *(src.add(offset + (3 * (SIMD_STRIDE_SIZE / unit_size))) - as *const $simd_ty) - }; - if !$func(unroll_accu) { - return false; - } - offset += 4 * (SIMD_STRIDE_SIZE / unit_size); -+ // Safety: this check lets us continue to perform the 4 reads earlier - if offset > len_minus_unroll { - break; - } - } - } - let mut simd_accu = $splat; - while offset <= len_minus_stride { -+ // Safety: the above check lets us perform one $simd_ty read. - simd_accu = simd_accu | unsafe { *(src.add(offset) as *const $simd_ty) }; - offset += SIMD_STRIDE_SIZE / unit_size; - } - if !$func(simd_accu) { - return false; - } - } - } -@@ -229,18 +243,18 @@ macro_rules! by_unit_check_simd { - accu < $bound - } - }; - } - - cfg_if! { - if #[cfg(all(feature = "simd-accel", any(target_feature = "sse2", all(target_endian = "little", target_arch = "aarch64"), all(target_endian = "little", target_feature = "neon"))))] { - use crate::simd_funcs::*; -- use packed_simd::u8x16; -- use packed_simd::u16x8; -+ use core::simd::u8x16; -+ use core::simd::u16x8; - - const SIMD_ALIGNMENT: usize = 16; - - const SIMD_ALIGNMENT_MASK: usize = 15; - - by_unit_check_simd!(is_ascii_impl, u8, u8x16::splat(0), u8x16, 0x80, simd_is_ascii); - by_unit_check_simd!(is_basic_latin_impl, u16, u16x8::splat(0), u16x8, 0x80, simd_is_basic_latin); - by_unit_check_simd!(is_utf16_latin1_impl, u16, u16x8::splat(0), u16x8, 0x100, simd_is_latin1); -diff --git a/third_party/rust/encoding_rs/src/simd_funcs.rs b/third_party/rust/encoding_rs/src/simd_funcs.rs ---- third_party/rust/encoding_rs/src/simd_funcs.rs -+++ third_party/rust/encoding_rs/src/simd_funcs.rs -@@ -2,65 +2,84 @@ - // file at the top-level directory of this distribution. - // - // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or - // https://www.apache.org/licenses/LICENSE-2.0> or the MIT license - // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your - // option. This file may not be copied, modified, or distributed - // except according to those terms. - --use packed_simd::u16x8; --use packed_simd::u8x16; --use packed_simd::IntoBits; -+use any_all_workaround::all_mask16x8; -+use any_all_workaround::all_mask8x16; -+use any_all_workaround::any_mask16x8; -+use any_all_workaround::any_mask8x16; -+use core::simd::cmp::SimdPartialEq; -+use core::simd::cmp::SimdPartialOrd; -+use core::simd::mask16x8; -+use core::simd::mask8x16; -+use core::simd::simd_swizzle; -+use core::simd::u16x8; -+use core::simd::u8x16; -+use core::simd::ToBytes; - - // TODO: Migrate unaligned access to stdlib code if/when the RFC - // https://github.com/rust-lang/rfcs/pull/1725 is implemented. - -+/// Safety invariant: ptr must be valid for an unaligned read of 16 bytes - #[inline(always)] - pub unsafe fn load16_unaligned(ptr: *const u8) -> u8x16 { -- let mut simd = ::core::mem::uninitialized(); -- ::core::ptr::copy_nonoverlapping(ptr, &mut simd as *mut u8x16 as *mut u8, 16); -- simd -+ let mut simd = ::core::mem::MaybeUninit::<u8x16>::uninit(); -+ ::core::ptr::copy_nonoverlapping(ptr, simd.as_mut_ptr() as *mut u8, 16); -+ // Safety: copied 16 bytes of initialized memory into this, it is now initialized -+ simd.assume_init() - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u8x16 read of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn load16_aligned(ptr: *const u8) -> u8x16 { - *(ptr as *const u8x16) - } - -+/// Safety invariant: ptr must be valid for an unaligned store of 16 bytes - #[inline(always)] - pub unsafe fn store16_unaligned(ptr: *mut u8, s: u8x16) { - ::core::ptr::copy_nonoverlapping(&s as *const u8x16 as *const u8, ptr, 16); - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u8x16 store of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn store16_aligned(ptr: *mut u8, s: u8x16) { - *(ptr as *mut u8x16) = s; - } - -+/// Safety invariant: ptr must be valid for an unaligned read of 16 bytes - #[inline(always)] - pub unsafe fn load8_unaligned(ptr: *const u16) -> u16x8 { -- let mut simd = ::core::mem::uninitialized(); -- ::core::ptr::copy_nonoverlapping(ptr as *const u8, &mut simd as *mut u16x8 as *mut u8, 16); -- simd -+ let mut simd = ::core::mem::MaybeUninit::<u16x8>::uninit(); -+ ::core::ptr::copy_nonoverlapping(ptr as *const u8, simd.as_mut_ptr() as *mut u8, 16); -+ // Safety: copied 16 bytes of initialized memory into this, it is now initialized -+ simd.assume_init() - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u16x8 read of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn load8_aligned(ptr: *const u16) -> u16x8 { - *(ptr as *const u16x8) - } - -+/// Safety invariant: ptr must be valid for an unaligned store of 16 bytes - #[inline(always)] - pub unsafe fn store8_unaligned(ptr: *mut u16, s: u16x8) { - ::core::ptr::copy_nonoverlapping(&s as *const u16x8 as *const u8, ptr as *mut u8, 16); - } - -+/// Safety invariant: ptr must be valid for an aligned-for-u16x8 store of 16 bytes - #[allow(dead_code)] - #[inline(always)] - pub unsafe fn store8_aligned(ptr: *mut u16, s: u16x8) { - *(ptr as *mut u16x8) = s; - } - - cfg_if! { - if #[cfg(all(target_feature = "sse2", target_arch = "x86_64"))] { -@@ -95,234 +114,241 @@ cfg_if! { - pub fn simd_byte_swap(s: u16x8) -> u16x8 { - let left = s << 8; - let right = s >> 8; - left | right - } - - #[inline(always)] - pub fn to_u16_lanes(s: u8x16) -> u16x8 { -- s.into_bits() -+ u16x8::from_ne_bytes(s) - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - - // Expose low-level mask instead of higher-level conclusion, - // because the non-ASCII case would perform less well otherwise. -+ // Safety-usable invariant: This returned value is whether each high bit is set - #[inline(always)] - pub fn mask_ascii(s: u8x16) -> i32 { - unsafe { -- _mm_movemask_epi8(s.into_bits()) -+ _mm_movemask_epi8(s.into()) - } - } - - } else { - - } - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - #[inline(always)] - pub fn simd_is_ascii(s: u8x16) -> bool { - unsafe { -- _mm_movemask_epi8(s.into_bits()) == 0 -+ // Safety: We have cfg()d the correct platform -+ _mm_movemask_epi8(s.into()) == 0 - } - } - } else if #[cfg(target_arch = "aarch64")]{ - #[inline(always)] - pub fn simd_is_ascii(s: u8x16) -> bool { - unsafe { -- vmaxvq_u8(s.into_bits()) < 0x80 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u8(s.into()) < 0x80 - } - } - } else { - #[inline(always)] - pub fn simd_is_ascii(s: u8x16) -> bool { - // This optimizes better on ARM than - // the lt formulation. - let highest_ascii = u8x16::splat(0x7F); -- !s.gt(highest_ascii).any() -+ !any_mask8x16(s.simd_gt(highest_ascii)) - } - } - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - #[inline(always)] - pub fn simd_is_str_latin1(s: u8x16) -> bool { - if simd_is_ascii(s) { - return true; - } - let above_str_latin1 = u8x16::splat(0xC4); -- s.lt(above_str_latin1).all() -+ s.simd_lt(above_str_latin1).all() - } - } else if #[cfg(target_arch = "aarch64")]{ - #[inline(always)] - pub fn simd_is_str_latin1(s: u8x16) -> bool { - unsafe { -- vmaxvq_u8(s.into_bits()) < 0xC4 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u8(s.into()) < 0xC4 - } - } - } else { - #[inline(always)] - pub fn simd_is_str_latin1(s: u8x16) -> bool { - let above_str_latin1 = u8x16::splat(0xC4); -- s.lt(above_str_latin1).all() -+ all_mask8x16(s.simd_lt(above_str_latin1)) - } - } - } - - cfg_if! { - if #[cfg(target_arch = "aarch64")]{ - #[inline(always)] - pub fn simd_is_basic_latin(s: u16x8) -> bool { - unsafe { -- vmaxvq_u16(s.into_bits()) < 0x80 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u16(s.into()) < 0x80 - } - } - - #[inline(always)] - pub fn simd_is_latin1(s: u16x8) -> bool { - unsafe { -- vmaxvq_u16(s.into_bits()) < 0x100 -+ // Safety: We have cfg()d the correct platform -+ vmaxvq_u16(s.into()) < 0x100 - } - } - } else { - #[inline(always)] - pub fn simd_is_basic_latin(s: u16x8) -> bool { - let above_ascii = u16x8::splat(0x80); -- s.lt(above_ascii).all() -+ all_mask16x8(s.simd_lt(above_ascii)) - } - - #[inline(always)] - pub fn simd_is_latin1(s: u16x8) -> bool { - // For some reason, on SSE2 this formulation - // seems faster in this case while the above - // function is better the other way round... - let highest_latin1 = u16x8::splat(0xFF); -- !s.gt(highest_latin1).any() -+ !any_mask16x8(s.simd_gt(highest_latin1)) - } - } - } - - #[inline(always)] - pub fn contains_surrogates(s: u16x8) -> bool { - let mask = u16x8::splat(0xF800); - let surrogate_bits = u16x8::splat(0xD800); -- (s & mask).eq(surrogate_bits).any() -+ any_mask16x8((s & mask).simd_eq(surrogate_bits)) - } - - cfg_if! { - if #[cfg(target_arch = "aarch64")]{ - macro_rules! aarch64_return_false_if_below_hebrew { - ($s:ident) => ({ - unsafe { -- if vmaxvq_u16($s.into_bits()) < 0x0590 { -+ // Safety: We have cfg()d the correct platform -+ if vmaxvq_u16($s.into()) < 0x0590 { - return false; - } - } - }) - } - - macro_rules! non_aarch64_return_false_if_all { - ($s:ident) => () - } - } else { - macro_rules! aarch64_return_false_if_below_hebrew { - ($s:ident) => () - } - - macro_rules! non_aarch64_return_false_if_all { - ($s:ident) => ({ -- if $s.all() { -+ if all_mask16x8($s) { - return false; - } - }) - } - } - } - - macro_rules! in_range16x8 { - ($s:ident, $start:expr, $end:expr) => {{ - // SIMD sub is wrapping -- ($s - u16x8::splat($start)).lt(u16x8::splat($end - $start)) -+ ($s - u16x8::splat($start)).simd_lt(u16x8::splat($end - $start)) - }}; - } - - #[inline(always)] - pub fn is_u16x8_bidi(s: u16x8) -> bool { - // We try to first quickly refute the RTLness of the vector. If that - // fails, we do the real RTL check, so in that case we end up wasting - // the work for the up-front quick checks. Even the quick-check is - // two-fold in order to return `false` ASAP if everything is below - // Hebrew. - - aarch64_return_false_if_below_hebrew!(s); - -- let below_hebrew = s.lt(u16x8::splat(0x0590)); -+ let below_hebrew = s.simd_lt(u16x8::splat(0x0590)); - - non_aarch64_return_false_if_all!(below_hebrew); - -- if (below_hebrew | in_range16x8!(s, 0x0900, 0x200F) | in_range16x8!(s, 0x2068, 0xD802)).all() { -+ if all_mask16x8( -+ below_hebrew | in_range16x8!(s, 0x0900, 0x200F) | in_range16x8!(s, 0x2068, 0xD802), -+ ) { - return false; - } - - // Quick refutation failed. Let's do the full check. - -- (in_range16x8!(s, 0x0590, 0x0900) -- | in_range16x8!(s, 0xFB1D, 0xFE00) -- | in_range16x8!(s, 0xFE70, 0xFEFF) -- | in_range16x8!(s, 0xD802, 0xD804) -- | in_range16x8!(s, 0xD83A, 0xD83C) -- | s.eq(u16x8::splat(0x200F)) -- | s.eq(u16x8::splat(0x202B)) -- | s.eq(u16x8::splat(0x202E)) -- | s.eq(u16x8::splat(0x2067))) -- .any() -+ any_mask16x8( -+ (in_range16x8!(s, 0x0590, 0x0900) -+ | in_range16x8!(s, 0xFB1D, 0xFE00) -+ | in_range16x8!(s, 0xFE70, 0xFEFF) -+ | in_range16x8!(s, 0xD802, 0xD804) -+ | in_range16x8!(s, 0xD83A, 0xD83C) -+ | s.simd_eq(u16x8::splat(0x200F)) -+ | s.simd_eq(u16x8::splat(0x202B)) -+ | s.simd_eq(u16x8::splat(0x202E)) -+ | s.simd_eq(u16x8::splat(0x2067))), -+ ) - } - - #[inline(always)] - pub fn simd_unpack(s: u8x16) -> (u16x8, u16x8) { -- unsafe { -- let first: u8x16 = shuffle!( -- s, -- u8x16::splat(0), -- [0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23] -- ); -- let second: u8x16 = shuffle!( -- s, -- u8x16::splat(0), -- [8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31] -- ); -- (first.into_bits(), second.into_bits()) -- } -+ let first: u8x16 = simd_swizzle!( -+ s, -+ u8x16::splat(0), -+ [0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23] -+ ); -+ let second: u8x16 = simd_swizzle!( -+ s, -+ u8x16::splat(0), -+ [8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31] -+ ); -+ (u16x8::from_ne_bytes(first), u16x8::from_ne_bytes(second)) - } - - cfg_if! { - if #[cfg(target_feature = "sse2")] { - #[inline(always)] - pub fn simd_pack(a: u16x8, b: u16x8) -> u8x16 { - unsafe { -- _mm_packus_epi16(a.into_bits(), b.into_bits()).into_bits() -+ // Safety: We have cfg()d the correct platform -+ _mm_packus_epi16(a.into(), b.into()).into() - } - } - } else { - #[inline(always)] - pub fn simd_pack(a: u16x8, b: u16x8) -> u8x16 { -- unsafe { -- let first: u8x16 = a.into_bits(); -- let second: u8x16 = b.into_bits(); -- shuffle!( -- first, -- second, -- [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30] -- ) -- } -+ let first: u8x16 = a.to_ne_bytes(); -+ let second: u8x16 = b.to_ne_bytes(); -+ simd_swizzle!( -+ first, -+ second, -+ [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30] -+ ) - } - } - } - - #[cfg(test)] - mod tests { - use super::*; - use alloc::vec::Vec; -diff --git a/third_party/rust/encoding_rs/src/single_byte.rs b/third_party/rust/encoding_rs/src/single_byte.rs ---- third_party/rust/encoding_rs/src/single_byte.rs -+++ third_party/rust/encoding_rs/src/single_byte.rs -@@ -48,16 +48,19 @@ impl SingleByteDecoder { - CopyAsciiResult::GoOn((mut non_ascii, mut handle)) => 'middle: loop { - // Start non-boilerplate - // - // Since the non-ASCIIness of `non_ascii` is hidden from - // the optimizer, it can't figure out that it's OK to - // statically omit the bound check when accessing - // `[u16; 128]` with an index - // `non_ascii as usize - 0x80usize`. -+ // -+ // Safety: `non_ascii` is a u8 byte >=0x80, from the invariants -+ // on Utf8Destination::copy_ascii_from_check_space_bmp() - let mapped = - unsafe { *(self.table.get_unchecked(non_ascii as usize - 0x80usize)) }; - // let mapped = self.table[non_ascii as usize - 0x80usize]; - if mapped == 0u16 { - return ( - DecoderResult::Malformed(1, 0), - source.consumed(), - handle.written(), -@@ -146,82 +149,103 @@ impl SingleByteDecoder { - dst: &mut [u16], - _last: bool, - ) -> (DecoderResult, usize, usize) { - let (pending, length) = if dst.len() < src.len() { - (DecoderResult::OutputFull, dst.len()) - } else { - (DecoderResult::InputEmpty, src.len()) - }; -+ // Safety invariant: converted <= length. Quite often we have `converted < length` -+ // which will be separately marked. - let mut converted = 0usize; - 'outermost: loop { - match unsafe { -+ // Safety: length is the minimum length, `src/dst + x` will always be valid for reads/writes of `len - x` - ascii_to_basic_latin( - src.as_ptr().add(converted), - dst.as_mut_ptr().add(converted), - length - converted, - ) - } { - None => { - return (pending, length, length); - } - Some((mut non_ascii, consumed)) => { -+ // Safety invariant: `converted <= length` upheld, since this can only consume -+ // up to `length - converted` bytes. -+ // -+ // Furthermore, in this context, -+ // we can assume `converted < length` since this branch is only ever hit when -+ // ascii_to_basic_latin fails to consume the entire slice - converted += consumed; - 'middle: loop { - // `converted` doesn't count the reading of `non_ascii` yet. - // Since the non-ASCIIness of `non_ascii` is hidden from - // the optimizer, it can't figure out that it's OK to - // statically omit the bound check when accessing - // `[u16; 128]` with an index - // `non_ascii as usize - 0x80usize`. -+ // -+ // Safety: We can rely on `non_ascii` being between `0x80` and `0xFF` due to -+ // the invariants of `ascii_to_basic_latin()`, and our table has enough space for that. - let mapped = - unsafe { *(self.table.get_unchecked(non_ascii as usize - 0x80usize)) }; - // let mapped = self.table[non_ascii as usize - 0x80usize]; - if mapped == 0u16 { - return ( - DecoderResult::Malformed(1, 0), - converted + 1, // +1 `for non_ascii` - converted, - ); - } - unsafe { -- // The bound check has already been performed -+ // Safety: As mentioned above, `converted < length` - *(dst.get_unchecked_mut(converted)) = mapped; - } -+ // Safety: `converted <= length` upheld, since `converted < length` before this - converted += 1; - // Next, handle ASCII punctuation and non-ASCII without - // going back to ASCII acceleration. Non-ASCII scripts - // use ASCII punctuation, so this avoid going to - // acceleration just for punctuation/space and then - // failing. This is a significant boost to non-ASCII - // scripts. - // TODO: Split out Latin converters without this part - // this stuff makes Latin script-conversion slower. - if converted == length { - return (pending, length, length); - } -+ // Safety: We are back to `converted < length` because of the == above -+ // and can perform this check. - let mut b = unsafe { *(src.get_unchecked(converted)) }; -+ // Safety: `converted < length` is upheld for this loop - 'innermost: loop { - if b > 127 { - non_ascii = b; - continue 'middle; - } - // Testing on Haswell says that we should write the - // byte unconditionally instead of trying to unread it - // to make it part of the next SIMD stride. - unsafe { -+ // Safety: `converted < length` is true for this loop - *(dst.get_unchecked_mut(converted)) = u16::from(b); - } -+ // Safety: We are now at `converted <= length`. We should *not* `continue` -+ // the loop without reverifying - converted += 1; - if b < 60 { - // We've got punctuation - if converted == length { - return (pending, length, length); - } -+ // Safety: we're back to `converted <= length` because of the == above - b = unsafe { *(src.get_unchecked(converted)) }; -+ // Safety: The loop continues as `converted < length` - continue 'innermost; - } - // We've got markup or ASCII text - continue 'outermost; - } - } - } - } -@@ -229,16 +253,18 @@ impl SingleByteDecoder { - } - - pub fn latin1_byte_compatible_up_to(&self, buffer: &[u8]) -> usize { - let mut bytes = buffer; - let mut total = 0; - loop { - if let Some((non_ascii, offset)) = validate_ascii(bytes) { - total += offset; -+ // Safety: We can rely on `non_ascii` being between `0x80` and `0xFF` due to -+ // the invariants of `ascii_to_basic_latin()`, and our table has enough space for that. - let mapped = unsafe { *(self.table.get_unchecked(non_ascii as usize - 0x80usize)) }; - if mapped != u16::from(non_ascii) { - return total; - } - total += 1; - bytes = &bytes[offset + 1..]; - } else { - return total; -@@ -379,64 +405,89 @@ impl SingleByteEncoder { - dst: &mut [u8], - _last: bool, - ) -> (EncoderResult, usize, usize) { - let (pending, length) = if dst.len() < src.len() { - (EncoderResult::OutputFull, dst.len()) - } else { - (EncoderResult::InputEmpty, src.len()) - }; -+ // Safety invariant: converted <= length. Quite often we have `converted < length` -+ // which will be separately marked. - let mut converted = 0usize; - 'outermost: loop { - match unsafe { -+ // Safety: length is the minimum length, `src/dst + x` will always be valid for reads/writes of `len - x` - basic_latin_to_ascii( - src.as_ptr().add(converted), - dst.as_mut_ptr().add(converted), - length - converted, - ) - } { - None => { - return (pending, length, length); - } - Some((mut non_ascii, consumed)) => { -+ // Safety invariant: `converted <= length` upheld, since this can only consume -+ // up to `length - converted` bytes. -+ // -+ // Furthermore, in this context, -+ // we can assume `converted < length` since this branch is only ever hit when -+ // ascii_to_basic_latin fails to consume the entire slice - converted += consumed; - 'middle: loop { - // `converted` doesn't count the reading of `non_ascii` yet. - match self.encode_u16(non_ascii) { - Some(byte) => { - unsafe { -+ // Safety: we're allowed this access since `converted < length` - *(dst.get_unchecked_mut(converted)) = byte; - } - converted += 1; -+ // `converted <= length` now - } - None => { - // At this point, we need to know if we - // have a surrogate. - let high_bits = non_ascii & 0xFC00u16; - if high_bits == 0xD800u16 { - // high surrogate - if converted + 1 == length { - // End of buffer. This surrogate is unpaired. - return ( - EncoderResult::Unmappable('\u{FFFD}'), - converted + 1, // +1 `for non_ascii` - converted, - ); - } -+ // Safety: convered < length from outside the match, and `converted + 1 != length`, -+ // So `converted + 1 < length` as well. We're in bounds - let second = - u32::from(unsafe { *src.get_unchecked(converted + 1) }); - if second & 0xFC00u32 != 0xDC00u32 { - return ( - EncoderResult::Unmappable('\u{FFFD}'), - converted + 1, // +1 `for non_ascii` - converted, - ); - } - // The next code unit is a low surrogate. - let astral: char = unsafe { -+ // Safety: We can rely on non_ascii being 0xD800-0xDBFF since the high bits are 0xD800 -+ // Then, (non_ascii << 10 - 0xD800 << 10) becomes between (0 to 0x3FF) << 10, which is between -+ // 0x400 to 0xffc00. Adding the 0x10000 gives a range of 0x10400 to 0x10fc00. Subtracting the 0xDC00 -+ // gives 0x2800 to 0x102000 -+ // The second term is between 0xDC00 and 0xDFFF from the check above. This gives a maximum -+ // possible range of (0x10400 + 0xDC00) to (0x102000 + 0xDFFF) which is 0x1E000 to 0x10ffff. -+ // This is in range. -+ // -+ // From a Unicode principles perspective this can also be verified as we have checked that `non_ascii` is a high surrogate -+ // (0xD800..=0xDBFF), and that `second` is a low surrogate (`0xDC00..=0xDFFF`), and we are applying reverse of the UTC16 transformation -+ // algorithm <https://en.wikipedia.org/wiki/UTF-16#Code_points_from_U+010000_to_U+10FFFF>, by applying the high surrogate - 0xD800 to the -+ // high ten bits, and the low surrogate - 0xDc00 to the low ten bits, and then adding 0x10000 - ::core::char::from_u32_unchecked( - (u32::from(non_ascii) << 10) + second - - (((0xD800u32 << 10) - 0x1_0000u32) + 0xDC00u32), - ) - }; - return ( - EncoderResult::Unmappable(astral), - converted + 2, // +2 `for non_ascii` and `second` -@@ -451,52 +502,63 @@ impl SingleByteEncoder { - converted, - ); - } - return ( - EncoderResult::unmappable_from_bmp(non_ascii), - converted + 1, // +1 `for non_ascii` - converted, - ); -+ // Safety: This branch diverges, so no need to uphold invariants on `converted` - } - } - // Next, handle ASCII punctuation and non-ASCII without - // going back to ASCII acceleration. Non-ASCII scripts - // use ASCII punctuation, so this avoid going to - // acceleration just for punctuation/space and then - // failing. This is a significant boost to non-ASCII - // scripts. - // TODO: Split out Latin converters without this part - // this stuff makes Latin script-conversion slower. - if converted == length { - return (pending, length, length); - } -+ // Safety: we're back to `converted < length` due to the == above and can perform -+ // the unchecked read - let mut unit = unsafe { *(src.get_unchecked(converted)) }; - 'innermost: loop { -+ // Safety: This loop always begins with `converted < length`, see -+ // the invariant outside and the comment on the continue below - if unit > 127 { - non_ascii = unit; - continue 'middle; - } - // Testing on Haswell says that we should write the - // byte unconditionally instead of trying to unread it - // to make it part of the next SIMD stride. - unsafe { -+ // Safety: Can rely on converted < length - *(dst.get_unchecked_mut(converted)) = unit as u8; - } - converted += 1; -+ // `converted <= length` here - if unit < 60 { - // We've got punctuation - if converted == length { - return (pending, length, length); - } -+ // Safety: `converted < length` due to the == above. The read is safe. - unit = unsafe { *(src.get_unchecked(converted)) }; -+ // Safety: This only happens if `converted < length`, maintaining it - continue 'innermost; - } - // We've got markup or ASCII text - continue 'outermost; -+ // Safety: All other routes to here diverge so the continue is the only -+ // way to run the innermost loop. - } - } - } - } - } - } - } - -diff --git a/third_party/rust/encoding_rs/src/x_user_defined.rs b/third_party/rust/encoding_rs/src/x_user_defined.rs ---- third_party/rust/encoding_rs/src/x_user_defined.rs -+++ third_party/rust/encoding_rs/src/x_user_defined.rs -@@ -9,22 +9,23 @@ - - use super::*; - use crate::handles::*; - use crate::variant::*; - - cfg_if! { - if #[cfg(feature = "simd-accel")] { - use simd_funcs::*; -- use packed_simd::u16x8; -+ use core::simd::u16x8; -+ use core::simd::cmp::SimdPartialOrd; - - #[inline(always)] - fn shift_upper(unpacked: u16x8) -> u16x8 { - let highest_ascii = u16x8::splat(0x7F); -- unpacked + unpacked.gt(highest_ascii).select(u16x8::splat(0xF700), u16x8::splat(0)) } -+ unpacked + unpacked.simd_gt(highest_ascii).select(u16x8::splat(0xF700), u16x8::splat(0)) } - } else { - } - } - - pub struct UserDefinedDecoder; - - impl UserDefinedDecoder { - pub fn new() -> VariantDecoder { -@@ -111,20 +112,25 @@ impl UserDefinedDecoder { - } else { - (DecoderResult::InputEmpty, src.len()) - }; - // Not bothering with alignment - let tail_start = length & !0xF; - let simd_iterations = length >> 4; - let src_ptr = src.as_ptr(); - let dst_ptr = dst.as_mut_ptr(); -+ // Safety: This is `for i in 0..length / 16` - for i in 0..simd_iterations { -+ // Safety: This is in bounds: length is the minumum valid length for both src/dst -+ // and i ranges to length/16, so multiplying by 16 will always be `< length` and can do -+ // a 16 byte read - let input = unsafe { load16_unaligned(src_ptr.add(i * 16)) }; - let (first, second) = simd_unpack(input); - unsafe { -+ // Safety: same as above, but this is two consecutive 8-byte reads - store8_unaligned(dst_ptr.add(i * 16), shift_upper(first)); - store8_unaligned(dst_ptr.add((i * 16) + 8), shift_upper(second)); - } - } - let src_tail = &src[tail_start..length]; - let dst_tail = &mut dst[tail_start..length]; - src_tail - .iter() diff --git a/www/librewolf/files/patch-rust-1.78.0-arm b/www/librewolf/files/patch-rust-1.78.0-arm deleted file mode 100644 index 8bef1af506f3..000000000000 --- a/www/librewolf/files/patch-rust-1.78.0-arm +++ /dev/null @@ -1,60 +0,0 @@ -Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291 - - -diff --git a/Cargo.lock b/Cargo.lock ---- Cargo.lock -+++ Cargo.lock -@@ -4580,6 +4580,7 @@ dependencies = [ - version = "0.3.0" - dependencies = [ - "libc", -+ "version_check", - ] - - [[package]] -diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml ---- gfx/qcms/Cargo.toml -+++ gfx/qcms/Cargo.toml -@@ -18,5 +18,8 @@ - iccv4-enabled = [] - cmyk = [] - - [dependencies] - libc = {version = "0.2", optional = true } -+ -+[build-dependencies] -+version_check = "0.9" -diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs -new file mode 100644 ---- /dev/null -+++ gfx/qcms/build.rs -@@ -0,0 +1,7 @@ -+extern crate version_check as rustc; -+ -+fn main() { -+ if rustc::is_min_version("1.78.0").unwrap_or(false) { -+ println!("cargo:rustc-cfg=stdsimd_split"); -+ } -+} -diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs ---- gfx/qcms/src/lib.rs -+++ gfx/qcms/src/lib.rs -@@ -5,13 +5,15 @@ - #![allow(non_camel_case_types)] - #![allow(non_snake_case)] - #![allow(non_upper_case_globals)] - // These are needed for the neon SIMD code and can be removed once the MSRV supports the - // instrinsics we use --#![cfg_attr(feature = "neon", feature(stdsimd))] -+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] -+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] -+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] - #![cfg_attr( -- feature = "neon", -+ all(target_arch = "arm", feature = "neon"), - feature(arm_target_feature, raw_ref_op) - - )] - - /// These values match the Rendering Intent values from the ICC spec - diff --git a/www/librewolf/files/patch-wayland-proxy b/www/librewolf/files/patch-wayland-proxy deleted file mode 100644 index d9cb16bd2215..000000000000 --- a/www/librewolf/files/patch-wayland-proxy +++ /dev/null @@ -1,15 +0,0 @@ ---- third_party/wayland-proxy/wayland-proxy.cpp.orig 2024-02-29 09:10:59.939556000 +0100 -+++ third_party/wayland-proxy/wayland-proxy.cpp 2024-02-29 15:07:13.914375000 +0100 -@@ -318,10 +318,10 @@ - } - - bool ProxiedConnection::ConnectToCompositor() { -- if (!(mCompositorFlags & POLLOUT)) { -+ /* if (!(mCompositorFlags & POLLOUT)) { - // Try again later - return true; -- } -+ }*/ - - struct sockaddr_un addr = {}; - addr.sun_family = AF_UNIX; diff --git a/www/librewolf/files/unity-menubar.patch b/www/librewolf/files/unity-menubar.patch deleted file mode 100644 index fb80c7749738..000000000000 --- a/www/librewolf/files/unity-menubar.patch +++ /dev/null @@ -1,5268 +0,0 @@ ---- a/browser/base/content/browser-menubar.inc -+++ b/browser/base/content/browser-menubar.inc -@@ -7,7 +7,12 @@ - # On macOS, we don't track whether activation of the native menubar happened - # with the keyboard. - #ifndef XP_MACOSX -- onpopupshowing="if (event.target.parentNode.parentNode == this) -+ onpopupshowing="if (event.target.parentNode.parentNode == this && -+#ifdef MOZ_WIDGET_GTK -+ document.documentElement.getAttribute('shellshowingmenubar') != 'true') -+#else -+ true) -+#endif - this.setAttribute('openedwithkey', - event.target.parentNode.openedWithKey);" - #endif ---- a/browser/base/content/browser.js -+++ b/browser/base/content/browser.js -@@ -6466,11 +6466,18 @@ function onViewToolbarsPopupShowing(aEve - MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl"); - let firstMenuItem = aInsertPoint || popup.firstElementChild; - let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); -+ -+ let shellShowingMenubar = document.documentElement.getAttribute("shellshowingmenubar") == "true"; -+ - for (let toolbar of toolbarNodes) { - if (!toolbar.hasAttribute("toolbarname")) { - continue; - } - -+ if (shellShowingMenubar && toolbar.id == "toolbar-menubar") { -+ continue; -+ } -+ - if (toolbar.id == "PersonalToolbar") { - let menu = BookmarkingUI.buildBookmarksToolbarSubmenu(toolbar); - popup.insertBefore(menu, firstMenuItem); ---- a/browser/components/places/content/places.xhtml -+++ b/browser/components/places/content/places.xhtml -@@ -165,6 +165,7 @@ - #else - <menubar id="placesMenu"> - <menu class="menu-iconic" data-l10n-id="places-organize-button" -+ _moz-menubarkeeplocal="true" - #endif - id="organizeButton"> - <menupopup id="organizeButtonPopup"> ---- a/dom/xul/XULPopupElement.cpp -+++ b/dom/xul/XULPopupElement.cpp -@@ -208,6 +208,10 @@ void XULPopupElement::GetState(nsString& - // set this here in case there's no frame for the popup - aState.AssignLiteral("closed"); - -+#ifdef MOZ_WIDGET_GTK -+ nsAutoString nativeState; -+#endif -+ - if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) { - switch (pm->GetPopupState(this)) { - case ePopupShown: -@@ -230,6 +234,11 @@ void XULPopupElement::GetState(nsString& - break; - } - } -+#ifdef MOZ_WIDGET_GTK -+ else if (GetAttr(kNameSpaceID_None, nsGkAtoms::_moz_nativemenupopupstate, nativeState)) { -+ aState = nativeState; -+ } -+#endif - } - - nsINode* XULPopupElement::GetTriggerNode() const { ---- a/dom/xul/moz.build -+++ b/dom/xul/moz.build -@@ -82,4 +82,9 @@ LOCAL_INCLUDES += [ - - include("/ipc/chromium/chromium-config.mozbuild") - -+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": -+ LOCAL_INCLUDES += [ -+ "/widget/gtk", -+ ] -+ - FINAL_LIBRARY = "xul" ---- a/layout/build/moz.build -+++ b/layout/build/moz.build -@@ -70,6 +70,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "an - "/dom/system", - "/dom/system/android", - ] -+elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": -+ LOCAL_INCLUDES += [ -+ "/widget/gtk", -+ ] - - XPCOM_MANIFESTS += [ - "components.conf", ---- a/modules/libpref/init/all.js -+++ b/modules/libpref/init/all.js -@@ -311,6 +311,9 @@ pref("dom.mouseevent.click.hack.use_lega - // Fastback caching - if this pref is negative, then we calculate the number - // of content viewers to cache based on the amount of available memory. - pref("browser.sessionhistory.max_total_viewers", -1); -+#ifdef MOZ_WIDGET_GTK -+pref("ui.use_unity_menubar", true); -+#endif - - // min font device pixel size at which to turn on high quality - pref("browser.display.auto_quality_min_font_size", 20); ---- a/toolkit/content/xul.css -+++ b/toolkit/content/xul.css -@@ -229,6 +229,13 @@ toolbox { - } - } - -+@media (-moz-platform: linux) { -+*|*:root[shellshowingmenubar="true"] -+toolbar[type="menubar"]:not([customizing="true"]) { -+ display: none !important; -+} -+} -+ - toolbarspring { - -moz-box-flex: 1000; - } ---- a/widget/gtk/moz.build -+++ b/widget/gtk/moz.build -@@ -77,6 +77,15 @@ UNIFIED_SOURCES += [ - - SOURCES += [ - "MediaKeysEventSourceFactory.cpp", -+ "nsDbusmenu.cpp", -+ "nsMenu.cpp", # conflicts with X11 headers -+ "nsMenuBar.cpp", -+ "nsMenuContainer.cpp", -+ "nsMenuItem.cpp", -+ "nsMenuObject.cpp", -+ "nsMenuSeparator.cpp", -+ "nsNativeMenuDocListener.cpp", -+ "nsNativeMenuService.cpp", - "nsNativeThemeGTK.cpp", # conflicts with X11 headers - "nsWindow.cpp", # conflicts with X11 headers - "WaylandVsyncSource.cpp", # conflicts with X11 headers -@@ -152,6 +161,7 @@ LOCAL_INCLUDES += [ - "/layout/base", - "/layout/forms", - "/layout/generic", -+ "/layout/style", - "/layout/xul", - "/other-licenses/atk-1.0", - "/third_party/cups/include", ---- /dev/null -+++ b/widget/gtk/nsDbusmenu.cpp -@@ -0,0 +1,61 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "nsDbusmenu.h" -+#include "prlink.h" -+#include "mozilla/ArrayUtils.h" -+ -+#define FUNC(name, type, params) \ -+nsDbusmenuFunctions::_##name##_fn nsDbusmenuFunctions::s_##name; -+DBUSMENU_GLIB_FUNCTIONS -+DBUSMENU_GTK_FUNCTIONS -+#undef FUNC -+ -+static PRLibrary *gDbusmenuGlib = nullptr; -+static PRLibrary *gDbusmenuGtk = nullptr; -+ -+typedef void (*nsDbusmenuFunc)(); -+struct nsDbusmenuDynamicFunction { -+ const char *functionName; -+ nsDbusmenuFunc *function; -+}; -+ -+/* static */ nsresult -+nsDbusmenuFunctions::Init() -+{ -+#define FUNC(name, type, params) \ -+ { #name, (nsDbusmenuFunc *)&nsDbusmenuFunctions::s_##name }, -+ static const nsDbusmenuDynamicFunction kDbusmenuGlibSymbols[] = { -+ DBUSMENU_GLIB_FUNCTIONS -+ }; -+ static const nsDbusmenuDynamicFunction kDbusmenuGtkSymbols[] = { -+ DBUSMENU_GTK_FUNCTIONS -+ }; -+ -+#define LOAD_LIBRARY(symbol, name) \ -+ if (!g##symbol) { \ -+ g##symbol = PR_LoadLibrary(name); \ -+ if (!g##symbol) { \ -+ return NS_ERROR_FAILURE; \ -+ } \ -+ } \ -+ for (uint32_t i = 0; i < mozilla::ArrayLength(k##symbol##Symbols); ++i) { \ -+ *k##symbol##Symbols[i].function = \ -+ PR_FindFunctionSymbol(g##symbol, k##symbol##Symbols[i].functionName); \ -+ if (!*k##symbol##Symbols[i].function) { \ -+ return NS_ERROR_FAILURE; \ -+ } \ -+ } -+ -+ LOAD_LIBRARY(DbusmenuGlib, "libdbusmenu-glib.so.4") -+#ifdef MOZ_WIDGET_GTK -+ LOAD_LIBRARY(DbusmenuGtk, "libdbusmenu-gtk3.so.4") -+#endif -+#undef LOAD_LIBRARY -+ -+ return NS_OK; -+} ---- /dev/null -+++ b/widget/gtk/nsDbusmenu.h -@@ -0,0 +1,101 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsDbusmenu_h__ -+#define __nsDbusmenu_h__ -+ -+#include "nsError.h" -+ -+#include <glib.h> -+#include <gdk/gdk.h> -+ -+#define DBUSMENU_GLIB_FUNCTIONS \ -+ FUNC(dbusmenu_menuitem_child_add_position, gboolean, (DbusmenuMenuitem *mi, DbusmenuMenuitem *child, guint position)) \ -+ FUNC(dbusmenu_menuitem_child_append, gboolean, (DbusmenuMenuitem *mi, DbusmenuMenuitem *child)) \ -+ FUNC(dbusmenu_menuitem_child_delete, gboolean, (DbusmenuMenuitem *mi, DbusmenuMenuitem *child)) \ -+ FUNC(dbusmenu_menuitem_get_children, GList*, (DbusmenuMenuitem *mi)) \ -+ FUNC(dbusmenu_menuitem_new, DbusmenuMenuitem*, (void)) \ -+ FUNC(dbusmenu_menuitem_property_get, const gchar*, (DbusmenuMenuitem *mi, const gchar *property)) \ -+ FUNC(dbusmenu_menuitem_property_get_bool, gboolean, (DbusmenuMenuitem *mi, const gchar *property)) \ -+ FUNC(dbusmenu_menuitem_property_remove, void, (DbusmenuMenuitem *mi, const gchar *property)) \ -+ FUNC(dbusmenu_menuitem_property_set, gboolean, (DbusmenuMenuitem *mi, const gchar *property, const gchar *value)) \ -+ FUNC(dbusmenu_menuitem_property_set_bool, gboolean, (DbusmenuMenuitem *mi, const gchar *property, const gboolean value)) \ -+ FUNC(dbusmenu_menuitem_property_set_int, gboolean, (DbusmenuMenuitem *mi, const gchar *property, const gint value)) \ -+ FUNC(dbusmenu_menuitem_show_to_user, void, (DbusmenuMenuitem *mi, guint timestamp)) \ -+ FUNC(dbusmenu_menuitem_take_children, GList*, (DbusmenuMenuitem *mi)) \ -+ FUNC(dbusmenu_server_new, DbusmenuServer*, (const gchar *object)) \ -+ FUNC(dbusmenu_server_set_root, void, (DbusmenuServer *server, DbusmenuMenuitem *root)) \ -+ FUNC(dbusmenu_server_set_status, void, (DbusmenuServer *server, DbusmenuStatus status)) -+ -+#define DBUSMENU_GTK_FUNCTIONS \ -+ FUNC(dbusmenu_menuitem_property_set_image, gboolean, (DbusmenuMenuitem *menuitem, const gchar *property, const GdkPixbuf *data)) \ -+ FUNC(dbusmenu_menuitem_property_set_shortcut, gboolean, (DbusmenuMenuitem *menuitem, guint key, GdkModifierType modifier)) -+ -+typedef struct _DbusmenuMenuitem DbusmenuMenuitem; -+typedef struct _DbusmenuServer DbusmenuServer; -+ -+enum DbusmenuStatus { -+ DBUSMENU_STATUS_NORMAL, -+ DBUSMENU_STATUS_NOTICE -+}; -+ -+#define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU "submenu" -+#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" -+#define DBUSMENU_MENUITEM_PROP_ENABLED "enabled" -+#define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data" -+#define DBUSMENU_MENUITEM_PROP_LABEL "label" -+#define DBUSMENU_MENUITEM_PROP_SHORTCUT "shortcut" -+#define DBUSMENU_MENUITEM_PROP_TYPE "type" -+#define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE "toggle-state" -+#define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE "toggle-type" -+#define DBUSMENU_MENUITEM_PROP_VISIBLE "visible" -+#define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW "about-to-show" -+#define DBUSMENU_MENUITEM_SIGNAL_EVENT "event" -+#define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED "item-activated" -+#define DBUSMENU_MENUITEM_TOGGLE_CHECK "checkmark" -+#define DBUSMENU_MENUITEM_TOGGLE_RADIO "radio" -+#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1 -+#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED 0 -+#define DBUSMENU_SERVER_PROP_DBUS_OBJECT "dbus-object" -+ -+class nsDbusmenuFunctions -+{ -+public: -+ nsDbusmenuFunctions() = delete; -+ -+ static nsresult Init(); -+ -+#define FUNC(name, type, params) \ -+ typedef type (*_##name##_fn) params; \ -+ static _##name##_fn s_##name; -+ DBUSMENU_GLIB_FUNCTIONS -+ DBUSMENU_GTK_FUNCTIONS -+#undef FUNC -+ -+}; -+ -+#define dbusmenu_menuitem_child_add_position nsDbusmenuFunctions::s_dbusmenu_menuitem_child_add_position -+#define dbusmenu_menuitem_child_append nsDbusmenuFunctions::s_dbusmenu_menuitem_child_append -+#define dbusmenu_menuitem_child_delete nsDbusmenuFunctions::s_dbusmenu_menuitem_child_delete -+#define dbusmenu_menuitem_get_children nsDbusmenuFunctions::s_dbusmenu_menuitem_get_children -+#define dbusmenu_menuitem_new nsDbusmenuFunctions::s_dbusmenu_menuitem_new -+#define dbusmenu_menuitem_property_get nsDbusmenuFunctions::s_dbusmenu_menuitem_property_get -+#define dbusmenu_menuitem_property_get_bool nsDbusmenuFunctions::s_dbusmenu_menuitem_property_get_bool -+#define dbusmenu_menuitem_property_remove nsDbusmenuFunctions::s_dbusmenu_menuitem_property_remove -+#define dbusmenu_menuitem_property_set nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set -+#define dbusmenu_menuitem_property_set_bool nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_bool -+#define dbusmenu_menuitem_property_set_int nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_int -+#define dbusmenu_menuitem_show_to_user nsDbusmenuFunctions::s_dbusmenu_menuitem_show_to_user -+#define dbusmenu_menuitem_take_children nsDbusmenuFunctions::s_dbusmenu_menuitem_take_children -+#define dbusmenu_server_new nsDbusmenuFunctions::s_dbusmenu_server_new -+#define dbusmenu_server_set_root nsDbusmenuFunctions::s_dbusmenu_server_set_root -+#define dbusmenu_server_set_status nsDbusmenuFunctions::s_dbusmenu_server_set_status -+ -+#define dbusmenu_menuitem_property_set_image nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_image -+#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut -+ -+#endif /* __nsDbusmenu_h__ */ ---- /dev/null -+++ b/widget/gtk/nsMenu.cpp -@@ -0,0 +1,795 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#define _IMPL_NS_LAYOUT -+ -+#include "mozilla/dom/Document.h" -+#include "mozilla/dom/Element.h" -+#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyleInlines.h" -+#include "mozilla/EventDispatcher.h" -+#include "mozilla/MouseEvents.h" -+#include "mozilla/PresShell.h" -+#include "mozilla/PresShellInlines.h" -+#include "nsComponentManagerUtils.h" -+#include "nsContentUtils.h" -+#include "nsCSSValue.h" -+#include "nsGkAtoms.h" -+#include "nsGtkUtils.h" -+#include "nsAtom.h" -+#include "nsIContent.h" -+#include "nsIRunnable.h" -+#include "nsITimer.h" -+#include "nsString.h" -+#include "nsStyleStruct.h" -+#include "nsThreadUtils.h" -+ -+#include "nsNativeMenuDocListener.h" -+ -+#include <glib-object.h> -+ -+#include "nsMenu.h" -+ -+using namespace mozilla; -+ -+class nsMenuContentInsertedEvent : public Runnable -+{ -+public: -+ nsMenuContentInsertedEvent(nsMenu *aMenu, -+ nsIContent *aContainer, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling) : -+ Runnable("nsMenuContentInsertedEvent"), -+ mWeakMenu(aMenu), -+ mContainer(aContainer), -+ mChild(aChild), -+ mPrevSibling(aPrevSibling) { } -+ -+ NS_IMETHODIMP Run() -+ { -+ if (!mWeakMenu) { -+ return NS_OK; -+ } -+ -+ static_cast<nsMenu *>(mWeakMenu.get())->HandleContentInserted(mContainer, -+ mChild, -+ mPrevSibling); -+ return NS_OK; -+ } -+ -+private: -+ nsWeakMenuObject mWeakMenu; -+ -+ nsCOMPtr<nsIContent> mContainer; -+ nsCOMPtr<nsIContent> mChild; -+ nsCOMPtr<nsIContent> mPrevSibling; -+}; -+ -+class nsMenuContentRemovedEvent : public Runnable -+{ -+public: -+ nsMenuContentRemovedEvent(nsMenu *aMenu, -+ nsIContent *aContainer, -+ nsIContent *aChild) : -+ Runnable("nsMenuContentRemovedEvent"), -+ mWeakMenu(aMenu), -+ mContainer(aContainer), -+ mChild(aChild) { } -+ -+ NS_IMETHODIMP Run() -+ { -+ if (!mWeakMenu) { -+ return NS_OK; -+ } -+ -+ static_cast<nsMenu *>(mWeakMenu.get())->HandleContentRemoved(mContainer, -+ mChild); -+ return NS_OK; -+ } -+ -+private: -+ nsWeakMenuObject mWeakMenu; -+ -+ nsCOMPtr<nsIContent> mContainer; -+ nsCOMPtr<nsIContent> mChild; -+}; -+ -+static void -+DispatchMouseEvent(nsIContent *aTarget, mozilla::EventMessage aMsg) -+{ -+ if (!aTarget) { -+ return; -+ } -+ -+ WidgetMouseEvent event(true, aMsg, nullptr, WidgetMouseEvent::eReal); -+ EventDispatcher::Dispatch(aTarget, nullptr, &event); -+} -+ -+void -+nsMenu::SetPopupState(EPopupState aState) -+{ -+ mPopupState = aState; -+ -+ if (!mPopupContent) { -+ return; -+ } -+ -+ nsAutoString state; -+ switch (aState) { -+ case ePopupState_Showing: -+ state.Assign(u"showing"_ns); -+ break; -+ case ePopupState_Open: -+ state.Assign(u"open"_ns); -+ break; -+ case ePopupState_Hiding: -+ state.Assign(u"hiding"_ns); -+ break; -+ default: -+ break; -+ } -+ -+ if (state.IsEmpty()) { -+ mPopupContent->AsElement()->UnsetAttr( -+ kNameSpaceID_None, nsGkAtoms::_moz_nativemenupopupstate, -+ false); -+ } else { -+ mPopupContent->AsElement()->SetAttr( -+ kNameSpaceID_None, nsGkAtoms::_moz_nativemenupopupstate, -+ state, false); -+ } -+} -+ -+/* static */ void -+nsMenu::DoOpenCallback(nsITimer *aTimer, void *aClosure) -+{ -+ nsMenu* self = static_cast<nsMenu *>(aClosure); -+ -+ dbusmenu_menuitem_show_to_user(self->GetNativeData(), 0); -+ -+ self->mOpenDelayTimer = nullptr; -+} -+ -+/* static */ void -+nsMenu::menu_event_cb(DbusmenuMenuitem *menu, -+ const gchar *name, -+ GVariant *value, -+ guint timestamp, -+ gpointer user_data) -+{ -+ nsMenu *self = static_cast<nsMenu *>(user_data); -+ -+ nsAutoCString event(name); -+ -+ if (event.Equals("closed"_ns)) { -+ self->OnClose(); -+ return; -+ } -+ -+ if (event.Equals("opened"_ns)) { -+ self->OnOpen(); -+ return; -+ } -+} -+ -+void -+nsMenu::MaybeAddPlaceholderItem() -+{ -+ MOZ_ASSERT(!IsInBatchedUpdate(), -+ "Shouldn't be modifying the native menu structure now"); -+ -+ GList *children = dbusmenu_menuitem_get_children(GetNativeData()); -+ if (!children) { -+ MOZ_ASSERT(!mPlaceholderItem); -+ -+ mPlaceholderItem = dbusmenu_menuitem_new(); -+ if (!mPlaceholderItem) { -+ return; -+ } -+ -+ dbusmenu_menuitem_property_set_bool(mPlaceholderItem, -+ DBUSMENU_MENUITEM_PROP_VISIBLE, -+ false); -+ -+ MOZ_ALWAYS_TRUE( -+ dbusmenu_menuitem_child_append(GetNativeData(), mPlaceholderItem)); -+ } -+} -+ -+void -+nsMenu::EnsureNoPlaceholderItem() -+{ -+ MOZ_ASSERT(!IsInBatchedUpdate(), -+ "Shouldn't be modifying the native menu structure now"); -+ -+ if (!mPlaceholderItem) { -+ return; -+ } -+ -+ MOZ_ALWAYS_TRUE( -+ dbusmenu_menuitem_child_delete(GetNativeData(), mPlaceholderItem)); -+ MOZ_ASSERT(!dbusmenu_menuitem_get_children(GetNativeData())); -+ -+ g_object_unref(mPlaceholderItem); -+ mPlaceholderItem = nullptr; -+} -+ -+void -+nsMenu::OnOpen() -+{ -+ if (mNeedsRebuild) { -+ Build(); -+ } -+ -+ nsWeakMenuObject self(this); -+ nsCOMPtr<nsIContent> origPopupContent(mPopupContent); -+ { -+ nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker; -+ -+ SetPopupState(ePopupState_Showing); -+ DispatchMouseEvent(mPopupContent, eXULPopupShowing); -+ -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, nsGkAtoms::open, -+ u"true"_ns, true); -+ } -+ -+ if (!self) { -+ // We were deleted! -+ return; -+ } -+ -+ // I guess that the popup could have changed -+ if (origPopupContent != mPopupContent) { -+ return; -+ } -+ -+ nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker; -+ -+ size_t count = ChildCount(); -+ for (size_t i = 0; i < count; ++i) { -+ ChildAt(i)->ContainerIsOpening(); -+ } -+ -+ SetPopupState(ePopupState_Open); -+ DispatchMouseEvent(mPopupContent, eXULPopupShown); -+} -+ -+void -+nsMenu::Build() -+{ -+ mNeedsRebuild = false; -+ -+ while (ChildCount() > 0) { -+ RemoveChildAt(0); -+ } -+ -+ InitializePopup(); -+ -+ if (!mPopupContent) { -+ return; -+ } -+ -+ uint32_t count = mPopupContent->GetChildCount(); -+ for (uint32_t i = 0; i < count; ++i) { -+ nsIContent *childContent = mPopupContent->GetChildAt_Deprecated(i); -+ -+ UniquePtr<nsMenuObject> child = CreateChild(childContent); -+ -+ if (!child) { -+ continue; -+ } -+ -+ AppendChild(std::move(child)); -+ } -+} -+ -+void -+nsMenu::InitializePopup() -+{ -+ nsCOMPtr<nsIContent> oldPopupContent; -+ oldPopupContent.swap(mPopupContent); -+ -+ for (uint32_t i = 0; i < ContentNode()->GetChildCount(); ++i) { -+ nsIContent *child = ContentNode()->GetChildAt_Deprecated(i); -+ -+ if (child->NodeInfo()->NameAtom() == nsGkAtoms::menupopup) { -+ mPopupContent = child; -+ break; -+ } -+ } -+ -+ if (oldPopupContent == mPopupContent) { -+ return; -+ } -+ -+ // The popup has changed -+ -+ if (oldPopupContent) { -+ DocListener()->UnregisterForContentChanges(oldPopupContent); -+ } -+ -+ SetPopupState(ePopupState_Closed); -+ -+ if (!mPopupContent) { -+ return; -+ } -+ -+ DocListener()->RegisterForContentChanges(mPopupContent, this); -+} -+ -+void -+nsMenu::RemoveChildAt(size_t aIndex) -+{ -+ MOZ_ASSERT(IsInBatchedUpdate() || !mPlaceholderItem, -+ "Shouldn't have a placeholder menuitem"); -+ -+ nsMenuContainer::RemoveChildAt(aIndex, !IsInBatchedUpdate()); -+ StructureMutated(); -+ -+ if (!IsInBatchedUpdate()) { -+ MaybeAddPlaceholderItem(); -+ } -+} -+ -+void -+nsMenu::RemoveChild(nsIContent *aChild) -+{ -+ size_t index = IndexOf(aChild); -+ if (index == NoIndex) { -+ return; -+ } -+ -+ RemoveChildAt(index); -+} -+ -+void -+nsMenu::InsertChildAfter(UniquePtr<nsMenuObject> aChild, -+ nsIContent *aPrevSibling) -+{ -+ if (!IsInBatchedUpdate()) { -+ EnsureNoPlaceholderItem(); -+ } -+ -+ nsMenuContainer::InsertChildAfter(std::move(aChild), aPrevSibling, -+ !IsInBatchedUpdate()); -+ StructureMutated(); -+} -+ -+void -+nsMenu::AppendChild(UniquePtr<nsMenuObject> aChild) -+{ -+ if (!IsInBatchedUpdate()) { -+ EnsureNoPlaceholderItem(); -+ } -+ -+ nsMenuContainer::AppendChild(std::move(aChild), !IsInBatchedUpdate()); -+ StructureMutated(); -+} -+ -+bool -+nsMenu::IsInBatchedUpdate() const -+{ -+ return mBatchedUpdateState != eBatchedUpdateState_Inactive; -+} -+ -+void -+nsMenu::StructureMutated() -+{ -+ if (!IsInBatchedUpdate()) { -+ return; -+ } -+ -+ mBatchedUpdateState = eBatchedUpdateState_DidMutate; -+} -+ -+bool -+nsMenu::CanOpen() const -+{ -+ bool isVisible = dbusmenu_menuitem_property_get_bool(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_VISIBLE); -+ bool isDisabled = ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::disabled, -+ nsGkAtoms::_true, -+ eCaseMatters); -+ -+ return (isVisible && !isDisabled); -+} -+ -+void -+nsMenu::HandleContentInserted(nsIContent *aContainer, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling) -+{ -+ if (aContainer == mPopupContent) { -+ UniquePtr<nsMenuObject> child = CreateChild(aChild); -+ -+ if (child) { -+ InsertChildAfter(std::move(child), aPrevSibling); -+ } -+ } else { -+ Build(); -+ } -+} -+ -+void -+nsMenu::HandleContentRemoved(nsIContent *aContainer, nsIContent *aChild) -+{ -+ if (aContainer == mPopupContent) { -+ RemoveChild(aChild); -+ } else { -+ Build(); -+ } -+} -+ -+void -+nsMenu::InitializeNativeData() -+{ -+ // Dbusmenu provides an "about-to-show" signal, and also "opened" and -+ // "closed" events. However, Unity is the only thing that sends -+ // both "about-to-show" and "opened" events. Unity 2D and the HUD only -+ // send "opened" events, so we ignore "about-to-show" (I don't think -+ // there's any real difference between them anyway). -+ // To complicate things, there are certain conditions where we don't -+ // get a "closed" event, so we need to be able to handle this :/ -+ g_signal_connect(G_OBJECT(GetNativeData()), "event", -+ G_CALLBACK(menu_event_cb), this); -+ -+ mNeedsRebuild = true; -+ mNeedsUpdate = true; -+ -+ MaybeAddPlaceholderItem(); -+} -+ -+void -+nsMenu::Update(const ComputedStyle *aComputedStyle) -+{ -+ if (mNeedsUpdate) { -+ mNeedsUpdate = false; -+ -+ UpdateLabel(); -+ UpdateSensitivity(); -+ } -+ -+ UpdateVisibility(aComputedStyle); -+ UpdateIcon(aComputedStyle); -+} -+ -+nsMenuObject::PropertyFlags -+nsMenu::SupportedProperties() const -+{ -+ return static_cast<nsMenuObject::PropertyFlags>( -+ nsMenuObject::ePropLabel | -+ nsMenuObject::ePropEnabled | -+ nsMenuObject::ePropVisible | -+ nsMenuObject::ePropIconData | -+ nsMenuObject::ePropChildDisplay -+ ); -+} -+ -+void -+nsMenu::OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) -+{ -+ MOZ_ASSERT(aContent == ContentNode() || aContent == mPopupContent, -+ "Received an event that wasn't meant for us!"); -+ -+ if (mNeedsUpdate) { -+ return; -+ } -+ -+ if (aContent != ContentNode()) { -+ return; -+ } -+ -+ if (!Parent()->IsBeingDisplayed()) { -+ mNeedsUpdate = true; -+ return; -+ } -+ -+ if (aAttribute == nsGkAtoms::disabled) { -+ UpdateSensitivity(); -+ } else if (aAttribute == nsGkAtoms::label || -+ aAttribute == nsGkAtoms::accesskey || -+ aAttribute == nsGkAtoms::crop) { -+ UpdateLabel(); -+ } else if (aAttribute == nsGkAtoms::hidden || -+ aAttribute == nsGkAtoms::collapsed) { -+ RefPtr<const ComputedStyle> style = GetComputedStyle(); -+ UpdateVisibility(style); -+ } else if (aAttribute == nsGkAtoms::image) { -+ RefPtr<const ComputedStyle> style = GetComputedStyle(); -+ UpdateIcon(style); -+ } -+} -+ -+void -+nsMenu::OnContentInserted(nsIContent *aContainer, nsIContent *aChild, -+ nsIContent *aPrevSibling) -+{ -+ MOZ_ASSERT(aContainer == ContentNode() || aContainer == mPopupContent, -+ "Received an event that wasn't meant for us!"); -+ -+ if (mNeedsRebuild) { -+ return; -+ } -+ -+ if (mPopupState == ePopupState_Closed) { -+ mNeedsRebuild = true; -+ return; -+ } -+ -+ nsContentUtils::AddScriptRunner( -+ new nsMenuContentInsertedEvent(this, aContainer, aChild, -+ aPrevSibling)); -+} -+ -+void -+nsMenu::OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) -+{ -+ MOZ_ASSERT(aContainer == ContentNode() || aContainer == mPopupContent, -+ "Received an event that wasn't meant for us!"); -+ -+ if (mNeedsRebuild) { -+ return; -+ } -+ -+ if (mPopupState == ePopupState_Closed) { -+ mNeedsRebuild = true; -+ return; -+ } -+ -+ nsContentUtils::AddScriptRunner( -+ new nsMenuContentRemovedEvent(this, aContainer, aChild)); -+} -+ -+/* -+ * Some menus (eg, the History menu in Firefox) refresh themselves on -+ * opening by removing all children and then re-adding new ones. As this -+ * happens whilst the menu is opening in Unity, it causes some flickering -+ * as the menu popup is resized multiple times. To avoid this, we try to -+ * reuse native menu items when the menu structure changes during a -+ * batched update. If we can handle menu structure changes from Gecko -+ * just by updating properties of native menu items (rather than destroying -+ * and creating new ones), then we eliminate any flickering that occurs as -+ * the menu is opened. To do this, we don't modify any native menu items -+ * until the end of the update batch. -+ */ -+ -+void -+nsMenu::OnBeginUpdates(nsIContent *aContent) -+{ -+ MOZ_ASSERT(aContent == ContentNode() || aContent == mPopupContent, -+ "Received an event that wasn't meant for us!"); -+ MOZ_ASSERT(!IsInBatchedUpdate(), "Already in an update batch!"); -+ -+ if (aContent != mPopupContent) { -+ return; -+ } -+ -+ mBatchedUpdateState = eBatchedUpdateState_Active; -+} -+ -+void -+nsMenu::OnEndUpdates() -+{ -+ if (!IsInBatchedUpdate()) { -+ return; -+ } -+ -+ bool didMutate = mBatchedUpdateState == eBatchedUpdateState_DidMutate; -+ mBatchedUpdateState = eBatchedUpdateState_Inactive; -+ -+ /* Optimize for the case where we only had attribute changes */ -+ if (!didMutate) { -+ return; -+ } -+ -+ EnsureNoPlaceholderItem(); -+ -+ GList *nextNativeChild = dbusmenu_menuitem_get_children(GetNativeData()); -+ DbusmenuMenuitem *nextOwnedNativeChild = nullptr; -+ -+ size_t count = ChildCount(); -+ -+ // Find the first native menu item that is `owned` by a corresponding -+ // Gecko menuitem -+ for (size_t i = 0; i < count; ++i) { -+ if (ChildAt(i)->GetNativeData()) { -+ nextOwnedNativeChild = ChildAt(i)->GetNativeData(); -+ break; -+ } -+ } -+ -+ // Now iterate over all Gecko menuitems -+ for (size_t i = 0; i < count; ++i) { -+ nsMenuObject *child = ChildAt(i); -+ -+ if (child->GetNativeData()) { -+ // This child already has a corresponding native menuitem. -+ // Remove all preceding orphaned native items. At this point, we -+ // modify the native menu structure. -+ while (nextNativeChild && -+ nextNativeChild->data != nextOwnedNativeChild) { -+ -+ DbusmenuMenuitem *data = -+ static_cast<DbusmenuMenuitem *>(nextNativeChild->data); -+ nextNativeChild = nextNativeChild->next; -+ -+ MOZ_ALWAYS_TRUE(dbusmenu_menuitem_child_delete(GetNativeData(), -+ data)); -+ } -+ -+ if (nextNativeChild) { -+ nextNativeChild = nextNativeChild->next; -+ } -+ -+ // Now find the next native menu item that is `owned` -+ nextOwnedNativeChild = nullptr; -+ for (size_t j = i + 1; j < count; ++j) { -+ if (ChildAt(j)->GetNativeData()) { -+ nextOwnedNativeChild = ChildAt(j)->GetNativeData(); -+ break; -+ } -+ } -+ } else { -+ // This child is new, and doesn't have a native menu item. Find one! -+ if (nextNativeChild && -+ nextNativeChild->data != nextOwnedNativeChild) { -+ -+ DbusmenuMenuitem *data = -+ static_cast<DbusmenuMenuitem *>(nextNativeChild->data); -+ -+ if (NS_SUCCEEDED(child->AdoptNativeData(data))) { -+ nextNativeChild = nextNativeChild->next; -+ } -+ } -+ -+ // There wasn't a suitable one available, so create a new one. -+ // At this point, we modify the native menu structure. -+ if (!child->GetNativeData()) { -+ child->CreateNativeData(); -+ MOZ_ALWAYS_TRUE( -+ dbusmenu_menuitem_child_add_position(GetNativeData(), -+ child->GetNativeData(), -+ i)); -+ } -+ } -+ } -+ -+ while (nextNativeChild) { -+ DbusmenuMenuitem *data = -+ static_cast<DbusmenuMenuitem *>(nextNativeChild->data); -+ nextNativeChild = nextNativeChild->next; -+ -+ MOZ_ALWAYS_TRUE(dbusmenu_menuitem_child_delete(GetNativeData(), data)); -+ } -+ -+ MaybeAddPlaceholderItem(); -+} -+ -+nsMenu::nsMenu(nsMenuContainer *aParent, nsIContent *aContent) : -+ nsMenuContainer(aParent, aContent), -+ mNeedsRebuild(false), -+ mNeedsUpdate(false), -+ mPlaceholderItem(nullptr), -+ mPopupState(ePopupState_Closed), -+ mBatchedUpdateState(eBatchedUpdateState_Inactive) -+{ -+ MOZ_COUNT_CTOR(nsMenu); -+} -+ -+nsMenu::~nsMenu() -+{ -+ if (IsInBatchedUpdate()) { -+ OnEndUpdates(); -+ } -+ -+ // Although nsTArray will take care of this in its destructor, -+ // we have to manually ensure children are removed from our native menu -+ // item, just in case our parent recycles us -+ while (ChildCount() > 0) { -+ RemoveChildAt(0); -+ } -+ -+ EnsureNoPlaceholderItem(); -+ -+ if (DocListener() && mPopupContent) { -+ DocListener()->UnregisterForContentChanges(mPopupContent); -+ } -+ -+ if (GetNativeData()) { -+ g_signal_handlers_disconnect_by_func(GetNativeData(), -+ FuncToGpointer(menu_event_cb), -+ this); -+ } -+ -+ MOZ_COUNT_DTOR(nsMenu); -+} -+ -+nsMenuObject::EType -+nsMenu::Type() const -+{ -+ return eType_Menu; -+} -+ -+bool -+nsMenu::IsBeingDisplayed() const -+{ -+ return mPopupState == ePopupState_Open; -+} -+ -+bool -+nsMenu::NeedsRebuild() const -+{ -+ return mNeedsRebuild; -+} -+ -+void -+nsMenu::OpenMenu() -+{ -+ if (!CanOpen()) { -+ return; -+ } -+ -+ if (mOpenDelayTimer) { -+ return; -+ } -+ -+ // Here, we synchronously fire popupshowing and popupshown events and then -+ // open the menu after a short delay. This allows the menu to refresh before -+ // it's shown, and avoids an issue where keyboard focus is not on the first -+ // item of the history menu in Firefox when opening it with the keyboard, -+ // because extra items to appear at the top of the menu -+ -+ OnOpen(); -+ -+ mOpenDelayTimer = NS_NewTimer(); -+ if (!mOpenDelayTimer) { -+ return; -+ } -+ -+ if (NS_FAILED(mOpenDelayTimer->InitWithNamedFuncCallback(DoOpenCallback, -+ this, -+ 100, -+ nsITimer::TYPE_ONE_SHOT, -+ "nsMenu::DoOpenCallback"))) { -+ mOpenDelayTimer = nullptr; -+ } -+} -+ -+void -+nsMenu::OnClose() -+{ -+ if (mPopupState == ePopupState_Closed) { -+ return; -+ } -+ -+ MOZ_ASSERT(nsContentUtils::IsSafeToRunScript()); -+ -+ // We do this to avoid mutating our view of the menu until -+ // after we have finished -+ nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker; -+ -+ SetPopupState(ePopupState_Hiding); -+ DispatchMouseEvent(mPopupContent, eXULPopupHiding); -+ -+ // Sigh, make sure all of our descendants are closed, as we don't -+ // always get closed events for submenus when scrubbing quickly through -+ // the menu -+ size_t count = ChildCount(); -+ for (size_t i = 0; i < count; ++i) { -+ if (ChildAt(i)->Type() == nsMenuObject::eType_Menu) { -+ static_cast<nsMenu *>(ChildAt(i))->OnClose(); -+ } -+ } -+ -+ SetPopupState(ePopupState_Closed); -+ DispatchMouseEvent(mPopupContent, eXULPopupHidden); -+ -+ ContentNode()->AsElement()->UnsetAttr(kNameSpaceID_None, nsGkAtoms::open, -+ true); -+} -+ ---- /dev/null -+++ b/widget/gtk/nsMenu.h -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsMenu_h__ -+#define __nsMenu_h__ -+ -+#include "mozilla/Attributes.h" -+#include "mozilla/UniquePtr.h" -+#include "nsCOMPtr.h" -+ -+#include "nsDbusmenu.h" -+#include "nsMenuContainer.h" -+#include "nsMenuObject.h" -+ -+#include <glib.h> -+ -+class nsAtom; -+class nsIContent; -+class nsITimer; -+ -+#define NSMENU_NUMBER_OF_POPUPSTATE_BITS 2U -+#define NSMENU_NUMBER_OF_FLAGS 4U -+ -+// This class represents a menu -+class nsMenu final : public nsMenuContainer -+{ -+public: -+ nsMenu(nsMenuContainer *aParent, nsIContent *aContent); -+ ~nsMenu(); -+ -+ nsMenuObject::EType Type() const override; -+ -+ bool IsBeingDisplayed() const override; -+ bool NeedsRebuild() const override; -+ -+ // Tell the desktop shell to display this menu -+ void OpenMenu(); -+ -+ // Normally called via the shell, but it's public so that child -+ // menuitems can do the shells work. Sigh.... -+ void OnClose(); -+ -+private: -+ friend class nsMenuContentInsertedEvent; -+ friend class nsMenuContentRemovedEvent; -+ -+ enum EPopupState { -+ ePopupState_Closed, -+ ePopupState_Showing, -+ ePopupState_Open, -+ ePopupState_Hiding -+ }; -+ -+ void SetPopupState(EPopupState aState); -+ -+ static void DoOpenCallback(nsITimer *aTimer, void *aClosure); -+ static void menu_event_cb(DbusmenuMenuitem *menu, -+ const gchar *name, -+ GVariant *value, -+ guint timestamp, -+ gpointer user_data); -+ -+ // We add a placeholder item to empty menus so that Unity actually treats -+ // us as a proper menu, rather than a menuitem without a submenu -+ void MaybeAddPlaceholderItem(); -+ -+ // Removes a placeholder item if it exists and asserts that this succeeds -+ void EnsureNoPlaceholderItem(); -+ -+ void OnOpen(); -+ void Build(); -+ void InitializePopup(); -+ void RemoveChildAt(size_t aIndex); -+ void RemoveChild(nsIContent *aChild); -+ void InsertChildAfter(mozilla::UniquePtr<nsMenuObject> aChild, -+ nsIContent *aPrevSibling); -+ void AppendChild(mozilla::UniquePtr<nsMenuObject> aChild); -+ bool IsInBatchedUpdate() const; -+ void StructureMutated(); -+ bool CanOpen() const; -+ -+ void HandleContentInserted(nsIContent *aContainer, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling); -+ void HandleContentRemoved(nsIContent *aContainer, -+ nsIContent *aChild); -+ -+ void InitializeNativeData() override; -+ void Update(const mozilla::ComputedStyle *aComputedStyle) override; -+ nsMenuObject::PropertyFlags SupportedProperties() const override; -+ -+ void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override; -+ void OnContentInserted(nsIContent *aContainer, nsIContent *aChild, -+ nsIContent *aPrevSibling) override; -+ void OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) override; -+ void OnBeginUpdates(nsIContent *aContent) override; -+ void OnEndUpdates() override; -+ -+ bool mNeedsRebuild; -+ bool mNeedsUpdate; -+ -+ DbusmenuMenuitem *mPlaceholderItem; -+ -+ EPopupState mPopupState; -+ -+ enum EBatchedUpdateState { -+ eBatchedUpdateState_Inactive, -+ eBatchedUpdateState_Active, -+ eBatchedUpdateState_DidMutate -+ }; -+ -+ EBatchedUpdateState mBatchedUpdateState; -+ -+ nsCOMPtr<nsIContent> mPopupContent; -+ -+ nsCOMPtr<nsITimer> mOpenDelayTimer; -+}; -+ -+#endif /* __nsMenu_h__ */ ---- /dev/null -+++ b/widget/gtk/nsMenuBar.cpp -@@ -0,0 +1,548 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "mozilla/Assertions.h" -+#include "mozilla/DebugOnly.h" -+#include "mozilla/dom/Document.h" -+#include "mozilla/dom/Element.h" -+#include "mozilla/dom/Event.h" -+#include "mozilla/dom/KeyboardEvent.h" -+#include "mozilla/dom/KeyboardEventBinding.h" -+#include "mozilla/Preferences.h" -+#include "nsContentUtils.h" -+#include "nsIDOMEventListener.h" -+#include "nsIRunnable.h" -+#include "nsIWidget.h" -+#include "nsTArray.h" -+#include "nsUnicharUtils.h" -+ -+#include "nsMenu.h" -+#include "nsNativeMenuService.h" -+ -+#include <gdk/gdk.h> -+#include <gdk/gdkx.h> -+#include <glib.h> -+#include <glib-object.h> -+ -+#include "nsMenuBar.h" -+ -+using namespace mozilla; -+ -+static bool -+ShouldHandleKeyEvent(dom::KeyboardEvent *aEvent) -+{ -+ return !aEvent->DefaultPrevented() && aEvent->IsTrusted(); -+} -+ -+class nsMenuBarContentInsertedEvent : public Runnable -+{ -+public: -+ nsMenuBarContentInsertedEvent(nsMenuBar *aMenuBar, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling) : -+ Runnable("nsMenuBarContentInsertedEvent"), -+ mWeakMenuBar(aMenuBar), -+ mChild(aChild), -+ mPrevSibling(aPrevSibling) { } -+ -+ NS_IMETHODIMP Run() -+ { -+ if (!mWeakMenuBar) { -+ return NS_OK; -+ } -+ -+ static_cast<nsMenuBar *>(mWeakMenuBar.get())->HandleContentInserted(mChild, -+ mPrevSibling); -+ return NS_OK; -+ } -+ -+private: -+ nsWeakMenuObject mWeakMenuBar; -+ -+ nsCOMPtr<nsIContent> mChild; -+ nsCOMPtr<nsIContent> mPrevSibling; -+}; -+ -+class nsMenuBarContentRemovedEvent : public Runnable -+{ -+public: -+ nsMenuBarContentRemovedEvent(nsMenuBar *aMenuBar, -+ nsIContent *aChild) : -+ Runnable("nsMenuBarContentRemovedEvent"), -+ mWeakMenuBar(aMenuBar), -+ mChild(aChild) { } -+ -+ NS_IMETHODIMP Run() -+ { -+ if (!mWeakMenuBar) { -+ return NS_OK; -+ } -+ -+ static_cast<nsMenuBar *>(mWeakMenuBar.get())->HandleContentRemoved(mChild); -+ return NS_OK; -+ } -+ -+private: -+ nsWeakMenuObject mWeakMenuBar; -+ -+ nsCOMPtr<nsIContent> mChild; -+}; -+ -+class nsMenuBar::DocEventListener final : public nsIDOMEventListener -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_NSIDOMEVENTLISTENER -+ -+ DocEventListener(nsMenuBar *aOwner) : mOwner(aOwner) { }; -+ -+private: -+ ~DocEventListener() { }; -+ -+ nsMenuBar *mOwner; -+}; -+ -+NS_IMPL_ISUPPORTS(nsMenuBar::DocEventListener, nsIDOMEventListener) -+ -+NS_IMETHODIMP -+nsMenuBar::DocEventListener::HandleEvent(dom::Event *aEvent) -+{ -+ nsAutoString type; -+ aEvent->GetType(type); -+ -+ if (type.Equals(u"focus"_ns)) { -+ mOwner->Focus(); -+ } else if (type.Equals(u"blur"_ns)) { -+ mOwner->Blur(); -+ } -+ -+ RefPtr<dom::KeyboardEvent> keyEvent = aEvent->AsKeyboardEvent(); -+ if (!keyEvent) { -+ return NS_OK; -+ } -+ -+ if (type.Equals(u"keypress"_ns)) { -+ return mOwner->Keypress(keyEvent); -+ } else if (type.Equals(u"keydown"_ns)) { -+ return mOwner->KeyDown(keyEvent); -+ } else if (type.Equals(u"keyup"_ns)) { -+ return mOwner->KeyUp(keyEvent); -+ } -+ -+ return NS_OK; -+} -+ -+nsMenuBar::nsMenuBar(nsIContent *aMenuBarNode) : -+ nsMenuContainer(new nsNativeMenuDocListener(aMenuBarNode), aMenuBarNode), -+ mTopLevel(nullptr), -+ mServer(nullptr), -+ mIsActive(false) -+{ -+ MOZ_COUNT_CTOR(nsMenuBar); -+} -+ -+nsresult -+nsMenuBar::Init(nsIWidget *aParent) -+{ -+ MOZ_ASSERT(aParent); -+ -+ GdkWindow *gdkWin = static_cast<GdkWindow *>( -+ aParent->GetNativeData(NS_NATIVE_WINDOW)); -+ if (!gdkWin) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ gpointer user_data = nullptr; -+ gdk_window_get_user_data(gdkWin, &user_data); -+ if (!user_data || !GTK_IS_CONTAINER(user_data)) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ mTopLevel = gtk_widget_get_toplevel(GTK_WIDGET(user_data)); -+ if (!mTopLevel) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ g_object_ref(mTopLevel); -+ -+ nsAutoCString path; -+ path.Append("/com/canonical/menu/"_ns); -+ char xid[10]; -+ sprintf(xid, "%X", static_cast<uint32_t>( -+ GDK_WINDOW_XID(gtk_widget_get_window(mTopLevel)))); -+ path.Append(xid); -+ -+ mServer = dbusmenu_server_new(path.get()); -+ if (!mServer) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ CreateNativeData(); -+ if (!GetNativeData()) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ dbusmenu_server_set_root(mServer, GetNativeData()); -+ -+ mEventListener = new DocEventListener(this); -+ -+ mDocument = ContentNode()->OwnerDoc(); -+ -+ mAccessKey = Preferences::GetInt("ui.key.menuAccessKey"); -+ if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_SHIFT) { -+ mAccessKeyMask = eModifierShift; -+ } else if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_CONTROL) { -+ mAccessKeyMask = eModifierCtrl; -+ } else if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_ALT) { -+ mAccessKeyMask = eModifierAlt; -+ } else if (mAccessKey == dom::KeyboardEvent_Binding::DOM_VK_META) { -+ mAccessKeyMask = eModifierMeta; -+ } else { -+ mAccessKeyMask = eModifierAlt; -+ } -+ -+ return NS_OK; -+} -+ -+void -+nsMenuBar::Build() -+{ -+ uint32_t count = ContentNode()->GetChildCount(); -+ for (uint32_t i = 0; i < count; ++i) { -+ nsIContent *childContent = ContentNode()->GetChildAt_Deprecated(i); -+ -+ UniquePtr<nsMenuObject> child = CreateChild(childContent); -+ -+ if (!child) { -+ continue; -+ } -+ -+ AppendChild(std::move(child)); -+ } -+} -+ -+void -+nsMenuBar::DisconnectDocumentEventListeners() -+{ -+ mDocument->RemoveEventListener(u"focus"_ns, -+ mEventListener, -+ true); -+ mDocument->RemoveEventListener(u"blur"_ns, -+ mEventListener, -+ true); -+ mDocument->RemoveEventListener(u"keypress"_ns, -+ mEventListener, -+ false); -+ mDocument->RemoveEventListener(u"keydown"_ns, -+ mEventListener, -+ false); -+ mDocument->RemoveEventListener(u"keyup"_ns, -+ mEventListener, -+ false); -+} -+ -+void -+nsMenuBar::SetShellShowingMenuBar(bool aShowing) -+{ -+ ContentNode()->OwnerDoc()->GetRootElement()->SetAttr( -+ kNameSpaceID_None, nsGkAtoms::shellshowingmenubar, -+ aShowing ? u"true"_ns : u"false"_ns, -+ true); -+} -+ -+void -+nsMenuBar::Focus() -+{ -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, -+ nsGkAtoms::openedwithkey, -+ u"false"_ns, true); -+} -+ -+void -+nsMenuBar::Blur() -+{ -+ // We do this here in case we lose focus before getting the -+ // keyup event, which leaves the menubar state looking like -+ // the alt key is stuck down -+ dbusmenu_server_set_status(mServer, DBUSMENU_STATUS_NORMAL); -+} -+ -+nsMenuBar::ModifierFlags -+nsMenuBar::GetModifiersFromEvent(dom::KeyboardEvent *aEvent) -+{ -+ ModifierFlags modifiers = static_cast<ModifierFlags>(0); -+ -+ if (aEvent->AltKey()) { -+ modifiers = static_cast<ModifierFlags>(modifiers | eModifierAlt); -+ } -+ -+ if (aEvent->ShiftKey()) { -+ modifiers = static_cast<ModifierFlags>(modifiers | eModifierShift); -+ } -+ -+ if (aEvent->CtrlKey()) { -+ modifiers = static_cast<ModifierFlags>(modifiers | eModifierCtrl); -+ } -+ -+ if (aEvent->MetaKey()) { -+ modifiers = static_cast<ModifierFlags>(modifiers | eModifierMeta); -+ } -+ -+ return modifiers; -+} -+ -+nsresult -+nsMenuBar::Keypress(dom::KeyboardEvent *aEvent) -+{ -+ if (!ShouldHandleKeyEvent(aEvent)) { -+ return NS_OK; -+ } -+ -+ ModifierFlags modifiers = GetModifiersFromEvent(aEvent); -+ if (((modifiers & mAccessKeyMask) == 0) || -+ ((modifiers & ~mAccessKeyMask) != 0)) { -+ return NS_OK; -+ } -+ -+ uint32_t charCode = aEvent->CharCode(); -+ if (charCode == 0) { -+ return NS_OK; -+ } -+ -+ char16_t ch = char16_t(charCode); -+ char16_t chl = ToLowerCase(ch); -+ char16_t chu = ToUpperCase(ch); -+ -+ nsMenuObject *found = nullptr; -+ uint32_t count = ChildCount(); -+ for (uint32_t i = 0; i < count; ++i) { -+ nsAutoString accesskey; -+ ChildAt(i)->ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, -+ nsGkAtoms::accesskey, -+ accesskey); -+ const nsAutoString::char_type *key = accesskey.BeginReading(); -+ if (*key == chu || *key == chl) { -+ found = ChildAt(i); -+ break; -+ } -+ } -+ -+ if (!found || found->Type() != nsMenuObject::eType_Menu) { -+ return NS_OK; -+ } -+ -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, -+ nsGkAtoms::openedwithkey, -+ u"true"_ns, true); -+ static_cast<nsMenu *>(found)->OpenMenu(); -+ -+ aEvent->StopPropagation(); -+ aEvent->PreventDefault(); -+ -+ return NS_OK; -+} -+ -+nsresult -+nsMenuBar::KeyDown(dom::KeyboardEvent *aEvent) -+{ -+ if (!ShouldHandleKeyEvent(aEvent)) { -+ return NS_OK; -+ } -+ -+ uint32_t keyCode = aEvent->KeyCode(); -+ ModifierFlags modifiers = GetModifiersFromEvent(aEvent); -+ if ((keyCode != mAccessKey) || ((modifiers & ~mAccessKeyMask) != 0)) { -+ return NS_OK; -+ } -+ -+ dbusmenu_server_set_status(mServer, DBUSMENU_STATUS_NOTICE); -+ -+ return NS_OK; -+} -+ -+nsresult -+nsMenuBar::KeyUp(dom::KeyboardEvent *aEvent) -+{ -+ if (!ShouldHandleKeyEvent(aEvent)) { -+ return NS_OK; -+ } -+ -+ uint32_t keyCode = aEvent->KeyCode(); -+ if (keyCode == mAccessKey) { -+ dbusmenu_server_set_status(mServer, DBUSMENU_STATUS_NORMAL); -+ } -+ -+ return NS_OK; -+} -+ -+void -+nsMenuBar::HandleContentInserted(nsIContent *aChild, nsIContent *aPrevSibling) -+{ -+ UniquePtr<nsMenuObject> child = CreateChild(aChild); -+ -+ if (!child) { -+ return; -+ } -+ -+ InsertChildAfter(std::move(child), aPrevSibling); -+} -+ -+void -+nsMenuBar::HandleContentRemoved(nsIContent *aChild) -+{ -+ RemoveChild(aChild); -+} -+ -+void -+nsMenuBar::OnContentInserted(nsIContent *aContainer, nsIContent *aChild, -+ nsIContent *aPrevSibling) -+{ -+ MOZ_ASSERT(aContainer == ContentNode(), -+ "Received an event that wasn't meant for us"); -+ -+ nsContentUtils::AddScriptRunner( -+ new nsMenuBarContentInsertedEvent(this, aChild, aPrevSibling)); -+} -+ -+void -+nsMenuBar::OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) -+{ -+ MOZ_ASSERT(aContainer == ContentNode(), -+ "Received an event that wasn't meant for us"); -+ -+ nsContentUtils::AddScriptRunner( -+ new nsMenuBarContentRemovedEvent(this, aChild)); -+} -+ -+nsMenuBar::~nsMenuBar() -+{ -+ nsNativeMenuService *service = nsNativeMenuService::GetSingleton(); -+ if (service) { -+ service->NotifyNativeMenuBarDestroyed(this); -+ } -+ -+ if (ContentNode()) { -+ SetShellShowingMenuBar(false); -+ } -+ -+ // We want to destroy all children before dropping our reference -+ // to the doc listener -+ while (ChildCount() > 0) { -+ RemoveChildAt(0); -+ } -+ -+ if (mTopLevel) { -+ g_object_unref(mTopLevel); -+ } -+ -+ if (DocListener()) { -+ DocListener()->Stop(); -+ } -+ -+ if (mDocument) { -+ DisconnectDocumentEventListeners(); -+ } -+ -+ if (mServer) { -+ g_object_unref(mServer); -+ } -+ -+ MOZ_COUNT_DTOR(nsMenuBar); -+} -+ -+/* static */ UniquePtr<nsMenuBar> -+nsMenuBar::Create(nsIWidget *aParent, nsIContent *aMenuBarNode) -+{ -+ UniquePtr<nsMenuBar> menubar(new nsMenuBar(aMenuBarNode)); -+ if (NS_FAILED(menubar->Init(aParent))) { -+ return nullptr; -+ } -+ -+ return menubar; -+} -+ -+nsMenuObject::EType -+nsMenuBar::Type() const -+{ -+ return eType_MenuBar; -+} -+ -+bool -+nsMenuBar::IsBeingDisplayed() const -+{ -+ return true; -+} -+ -+uint32_t -+nsMenuBar::WindowId() const -+{ -+ return static_cast<uint32_t>(GDK_WINDOW_XID(gtk_widget_get_window(mTopLevel))); -+} -+ -+nsCString -+nsMenuBar::ObjectPath() const -+{ -+ gchar *tmp; -+ g_object_get(mServer, DBUSMENU_SERVER_PROP_DBUS_OBJECT, &tmp, NULL); -+ -+ nsCString result; -+ result.Adopt(tmp); -+ -+ return result; -+} -+ -+void -+nsMenuBar::Activate() -+{ -+ if (mIsActive) { -+ return; -+ } -+ -+ mIsActive = true; -+ -+ mDocument->AddEventListener(u"focus"_ns, -+ mEventListener, -+ true); -+ mDocument->AddEventListener(u"blur"_ns, -+ mEventListener, -+ true); -+ mDocument->AddEventListener(u"keypress"_ns, -+ mEventListener, -+ false); -+ mDocument->AddEventListener(u"keydown"_ns, -+ mEventListener, -+ false); -+ mDocument->AddEventListener(u"keyup"_ns, -+ mEventListener, -+ false); -+ -+ // Clear this. Not sure if we really need to though -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, -+ nsGkAtoms::openedwithkey, -+ u"false"_ns, true); -+ -+ DocListener()->Start(); -+ Build(); -+ SetShellShowingMenuBar(true); -+} -+ -+void -+nsMenuBar::Deactivate() -+{ -+ if (!mIsActive) { -+ return; -+ } -+ -+ mIsActive = false; -+ -+ SetShellShowingMenuBar(false); -+ while (ChildCount() > 0) { -+ RemoveChildAt(0); -+ } -+ DocListener()->Stop(); -+ DisconnectDocumentEventListeners(); -+} ---- /dev/null -+++ b/widget/gtk/nsMenuBar.h -@@ -0,0 +1,111 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsMenuBar_h__ -+#define __nsMenuBar_h__ -+ -+#include "mozilla/Attributes.h" -+#include "mozilla/UniquePtr.h" -+#include "nsCOMPtr.h" -+#include "nsString.h" -+ -+#include "nsDbusmenu.h" -+#include "nsMenuContainer.h" -+#include "nsMenuObject.h" -+ -+#include <gtk/gtk.h> -+ -+class nsIContent; -+class nsIWidget; -+class nsMenuBarDocEventListener; -+ -+namespace mozilla { -+namespace dom { -+class Document; -+class KeyboardEvent; -+} -+} -+ -+/* -+ * The menubar class. There is one of these per window (and the window -+ * owns its menubar). Each menubar has an object path, and the service is -+ * responsible for telling the desktop shell which object path corresponds -+ * to a particular window. A menubar and its hierarchy also own a -+ * nsNativeMenuDocListener. -+ */ -+class nsMenuBar final : public nsMenuContainer -+{ -+public: -+ ~nsMenuBar() override; -+ -+ static mozilla::UniquePtr<nsMenuBar> Create(nsIWidget *aParent, -+ nsIContent *aMenuBarNode); -+ -+ nsMenuObject::EType Type() const override; -+ -+ bool IsBeingDisplayed() const override; -+ -+ // Get the native window ID for this menubar -+ uint32_t WindowId() const; -+ -+ // Get the object path for this menubar -+ nsCString ObjectPath() const; -+ -+ // Get the top-level GtkWindow handle -+ GtkWidget* TopLevelWindow() { return mTopLevel; } -+ -+ // Called from the menuservice when the menubar is about to be registered. -+ // Causes the native menubar to be created, and the XUL menubar to be hidden -+ void Activate(); -+ -+ // Called from the menuservice when the menubar is no longer registered -+ // with the desktop shell. Will cause the XUL menubar to be shown again -+ void Deactivate(); -+ -+private: -+ class DocEventListener; -+ friend class nsMenuBarContentInsertedEvent; -+ friend class nsMenuBarContentRemovedEvent; -+ -+ enum ModifierFlags { -+ eModifierShift = (1 << 0), -+ eModifierCtrl = (1 << 1), -+ eModifierAlt = (1 << 2), -+ eModifierMeta = (1 << 3) -+ }; -+ -+ nsMenuBar(nsIContent *aMenuBarNode); -+ nsresult Init(nsIWidget *aParent); -+ void Build(); -+ void DisconnectDocumentEventListeners(); -+ void SetShellShowingMenuBar(bool aShowing); -+ void Focus(); -+ void Blur(); -+ ModifierFlags GetModifiersFromEvent(mozilla::dom::KeyboardEvent *aEvent); -+ nsresult Keypress(mozilla::dom::KeyboardEvent *aEvent); -+ nsresult KeyDown(mozilla::dom::KeyboardEvent *aEvent); -+ nsresult KeyUp(mozilla::dom::KeyboardEvent *aEvent); -+ -+ void HandleContentInserted(nsIContent *aChild, -+ nsIContent *aPrevSibling); -+ void HandleContentRemoved(nsIContent *aChild); -+ -+ void OnContentInserted(nsIContent *aContainer, nsIContent *aChild, -+ nsIContent *aPrevSibling) override; -+ void OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) override; -+ -+ GtkWidget *mTopLevel; -+ DbusmenuServer *mServer; -+ nsCOMPtr<mozilla::dom::Document> mDocument; -+ RefPtr<DocEventListener> mEventListener; -+ -+ uint32_t mAccessKey; -+ ModifierFlags mAccessKeyMask; -+ bool mIsActive; -+}; -+ -+#endif /* __nsMenuBar_h__ */ ---- /dev/null -+++ b/widget/gtk/nsMenuContainer.cpp -@@ -0,0 +1,170 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "mozilla/DebugOnly.h" -+#include "nsGkAtoms.h" -+#include "nsIContent.h" -+ -+#include "nsDbusmenu.h" -+#include "nsMenu.h" -+#include "nsMenuItem.h" -+#include "nsMenuSeparator.h" -+ -+#include "nsMenuContainer.h" -+ -+using namespace mozilla; -+ -+const nsMenuContainer::ChildTArray::index_type nsMenuContainer::NoIndex = nsMenuContainer::ChildTArray::NoIndex; -+ -+typedef UniquePtr<nsMenuObject> (*nsMenuObjectConstructor)(nsMenuContainer*, -+ nsIContent*); -+ -+template<class T> -+static UniquePtr<nsMenuObject> CreateMenuObject(nsMenuContainer *aContainer, -+ nsIContent *aContent) -+{ -+ return UniquePtr<T>(new T(aContainer, aContent)); -+} -+ -+static nsMenuObjectConstructor -+GetMenuObjectConstructor(nsIContent *aContent) -+{ -+ if (aContent->IsXULElement(nsGkAtoms::menuitem)) { -+ return CreateMenuObject<nsMenuItem>; -+ } else if (aContent->IsXULElement(nsGkAtoms::menu)) { -+ return CreateMenuObject<nsMenu>; -+ } else if (aContent->IsXULElement(nsGkAtoms::menuseparator)) { -+ return CreateMenuObject<nsMenuSeparator>; -+ } -+ -+ return nullptr; -+} -+ -+static bool -+ContentIsSupported(nsIContent *aContent) -+{ -+ return GetMenuObjectConstructor(aContent) ? true : false; -+} -+ -+nsMenuContainer::nsMenuContainer(nsMenuContainer *aParent, -+ nsIContent *aContent) : -+ nsMenuObject(aParent, aContent) -+{ -+} -+ -+nsMenuContainer::nsMenuContainer(nsNativeMenuDocListener *aListener, -+ nsIContent *aContent) : -+ nsMenuObject(aListener, aContent) -+{ -+} -+ -+UniquePtr<nsMenuObject> -+nsMenuContainer::CreateChild(nsIContent *aContent) -+{ -+ nsMenuObjectConstructor ctor = GetMenuObjectConstructor(aContent); -+ if (!ctor) { -+ // There are plenty of node types we might stumble across that -+ // aren't supported -+ return nullptr; -+ } -+ -+ UniquePtr<nsMenuObject> res = ctor(this, aContent); -+ return res; -+} -+ -+size_t -+nsMenuContainer::IndexOf(nsIContent *aChild) const -+{ -+ if (!aChild) { -+ return NoIndex; -+ } -+ -+ size_t count = ChildCount(); -+ for (size_t i = 0; i < count; ++i) { -+ if (ChildAt(i)->ContentNode() == aChild) { -+ return i; -+ } -+ } -+ -+ return NoIndex; -+} -+ -+void -+nsMenuContainer::RemoveChildAt(size_t aIndex, bool aUpdateNative) -+{ -+ MOZ_ASSERT(aIndex < ChildCount()); -+ -+ if (aUpdateNative) { -+ MOZ_ALWAYS_TRUE( -+ dbusmenu_menuitem_child_delete(GetNativeData(), -+ ChildAt(aIndex)->GetNativeData())); -+ } -+ -+ mChildren.RemoveElementAt(aIndex); -+} -+ -+void -+nsMenuContainer::RemoveChild(nsIContent *aChild, bool aUpdateNative) -+{ -+ size_t index = IndexOf(aChild); -+ if (index == NoIndex) { -+ return; -+ } -+ -+ RemoveChildAt(index, aUpdateNative); -+} -+ -+void -+nsMenuContainer::InsertChildAfter(UniquePtr<nsMenuObject> aChild, -+ nsIContent *aPrevSibling, -+ bool aUpdateNative) -+{ -+ size_t index = IndexOf(aPrevSibling); -+ MOZ_ASSERT(!aPrevSibling || index != NoIndex); -+ -+ ++index; -+ -+ if (aUpdateNative) { -+ aChild->CreateNativeData(); -+ MOZ_ALWAYS_TRUE( -+ dbusmenu_menuitem_child_add_position(GetNativeData(), -+ aChild->GetNativeData(), -+ index)); -+ } -+ -+ mChildren.InsertElementAt(index, std::move(aChild)); -+} -+ -+void -+nsMenuContainer::AppendChild(UniquePtr<nsMenuObject> aChild, -+ bool aUpdateNative) -+{ -+ if (aUpdateNative) { -+ aChild->CreateNativeData(); -+ MOZ_ALWAYS_TRUE( -+ dbusmenu_menuitem_child_append(GetNativeData(), -+ aChild->GetNativeData())); -+ } -+ -+ mChildren.AppendElement(std::move(aChild)); -+} -+ -+bool -+nsMenuContainer::NeedsRebuild() const -+{ -+ return false; -+} -+ -+/* static */ nsIContent* -+nsMenuContainer::GetPreviousSupportedSibling(nsIContent *aContent) -+{ -+ do { -+ aContent = aContent->GetPreviousSibling(); -+ } while (aContent && !ContentIsSupported(aContent)); -+ -+ return aContent; -+} ---- /dev/null -+++ b/widget/gtk/nsMenuContainer.h -@@ -0,0 +1,70 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsMenuContainer_h__ -+#define __nsMenuContainer_h__ -+ -+#include "mozilla/UniquePtr.h" -+#include "nsTArray.h" -+ -+#include "nsMenuObject.h" -+ -+class nsIContent; -+class nsNativeMenuDocListener; -+ -+// Base class for containers (menus and menubars) -+class nsMenuContainer : public nsMenuObject -+{ -+public: -+ typedef nsTArray<mozilla::UniquePtr<nsMenuObject> > ChildTArray; -+ -+ // Determine if this container is being displayed on screen. Must be -+ // implemented by subclasses. Must return true if the container is -+ // in the fully open state, or false otherwise -+ virtual bool IsBeingDisplayed() const = 0; -+ -+ // Determine if this container will be rebuilt the next time it opens. -+ // Returns false by default but can be overridden by subclasses -+ virtual bool NeedsRebuild() const; -+ -+ // Return the first previous sibling that is of a type supported by the -+ // menu system -+ static nsIContent* GetPreviousSupportedSibling(nsIContent *aContent); -+ -+ static const ChildTArray::index_type NoIndex; -+ -+protected: -+ nsMenuContainer(nsMenuContainer *aParent, nsIContent *aContent); -+ nsMenuContainer(nsNativeMenuDocListener *aListener, nsIContent *aContent); -+ -+ // Create a new child element for the specified content node -+ mozilla::UniquePtr<nsMenuObject> CreateChild(nsIContent *aContent); -+ -+ // Return the index of the child for the specified content node -+ size_t IndexOf(nsIContent *aChild) const; -+ -+ size_t ChildCount() const { return mChildren.Length(); } -+ nsMenuObject* ChildAt(size_t aIndex) const { return mChildren[aIndex].get(); } -+ -+ void RemoveChildAt(size_t aIndex, bool aUpdateNative = true); -+ -+ // Remove the child that owns the specified content node -+ void RemoveChild(nsIContent *aChild, bool aUpdateNative = true); -+ -+ // Insert a new child after the child that owns the specified content node -+ void InsertChildAfter(mozilla::UniquePtr<nsMenuObject> aChild, -+ nsIContent *aPrevSibling, -+ bool aUpdateNative = true); -+ -+ void AppendChild(mozilla::UniquePtr<nsMenuObject> aChild, -+ bool aUpdateNative = true); -+ -+private: -+ ChildTArray mChildren; -+}; -+ -+#endif /* __nsMenuContainer_h__ */ ---- /dev/null -+++ b/widget/gtk/nsMenuItem.cpp -@@ -0,0 +1,766 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "mozilla/ArrayUtils.h" -+#include "mozilla/Assertions.h" -+#include "mozilla/dom/Document.h" -+#include "mozilla/dom/Element.h" -+#include "mozilla/dom/KeyboardEventBinding.h" -+#include "mozilla/dom/XULCommandEvent.h" -+#include "mozilla/Preferences.h" -+#include "mozilla/TextEvents.h" -+#include "nsContentUtils.h" -+#include "nsCRT.h" -+#include "nsGkAtoms.h" -+#include "nsGlobalWindowInner.h" -+#include "nsGtkUtils.h" -+#include "nsIContent.h" -+#include "nsIRunnable.h" -+#include "nsQueryObject.h" -+#include "nsReadableUtils.h" -+#include "nsString.h" -+#include "nsThreadUtils.h" -+ -+#include "nsMenu.h" -+#include "nsMenuBar.h" -+#include "nsMenuContainer.h" -+#include "nsNativeMenuDocListener.h" -+ -+#include <gdk/gdk.h> -+#include <gdk/gdkkeysyms.h> -+#include <gdk/gdkkeysyms-compat.h> -+#include <gdk/gdkx.h> -+#include <gtk/gtk.h> -+ -+#include "nsMenuItem.h" -+ -+using namespace mozilla; -+ -+struct KeyCodeData { -+ const char* str; -+ size_t strlength; -+ uint32_t keycode; -+}; -+ -+static struct KeyCodeData gKeyCodes[] = { -+#define NS_DEFINE_VK(aDOMKeyName, aDOMKeyCode) \ -+ { #aDOMKeyName, sizeof(#aDOMKeyName) - 1, aDOMKeyCode }, -+#include "mozilla/VirtualKeyCodeList.h" -+#undef NS_DEFINE_VK -+ { nullptr, 0, 0 } -+}; -+ -+struct KeyPair { -+ uint32_t DOMKeyCode; -+ guint GDKKeyval; -+}; -+ -+// -+// Netscape keycodes are defined in widget/public/nsGUIEvent.h -+// GTK keycodes are defined in <gdk/gdkkeysyms.h> -+// -+static const KeyPair gKeyPairs[] = { -+ { NS_VK_CANCEL, GDK_Cancel }, -+ { NS_VK_BACK, GDK_BackSpace }, -+ { NS_VK_TAB, GDK_Tab }, -+ { NS_VK_TAB, GDK_ISO_Left_Tab }, -+ { NS_VK_CLEAR, GDK_Clear }, -+ { NS_VK_RETURN, GDK_Return }, -+ { NS_VK_SHIFT, GDK_Shift_L }, -+ { NS_VK_SHIFT, GDK_Shift_R }, -+ { NS_VK_SHIFT, GDK_Shift_Lock }, -+ { NS_VK_CONTROL, GDK_Control_L }, -+ { NS_VK_CONTROL, GDK_Control_R }, -+ { NS_VK_ALT, GDK_Alt_L }, -+ { NS_VK_ALT, GDK_Alt_R }, -+ { NS_VK_META, GDK_Meta_L }, -+ { NS_VK_META, GDK_Meta_R }, -+ -+ // Assume that Super or Hyper is always mapped to physical Win key. -+ { NS_VK_WIN, GDK_Super_L }, -+ { NS_VK_WIN, GDK_Super_R }, -+ { NS_VK_WIN, GDK_Hyper_L }, -+ { NS_VK_WIN, GDK_Hyper_R }, -+ -+ // GTK's AltGraph key is similar to Mac's Option (Alt) key. However, -+ // unfortunately, browsers on Mac are using NS_VK_ALT for it even though -+ // it's really different from Alt key on Windows. -+ // On the other hand, GTK's AltGrapsh keys are really different from -+ // Alt key. However, there is no AltGrapsh key on Windows. On Windows, -+ // both Ctrl and Alt keys are pressed internally when AltGr key is pressed. -+ // For some languages' users, AltGraph key is important, so, web -+ // applications on such locale may want to know AltGraph key press. -+ // Therefore, we should map AltGr keycode for them only on GTK. -+ { NS_VK_ALTGR, GDK_ISO_Level3_Shift }, -+ { NS_VK_ALTGR, GDK_ISO_Level5_Shift }, -+ // We assume that Mode_switch is always used for level3 shift. -+ { NS_VK_ALTGR, GDK_Mode_switch }, -+ -+ { NS_VK_PAUSE, GDK_Pause }, -+ { NS_VK_CAPS_LOCK, GDK_Caps_Lock }, -+ { NS_VK_KANA, GDK_Kana_Lock }, -+ { NS_VK_KANA, GDK_Kana_Shift }, -+ { NS_VK_HANGUL, GDK_Hangul }, -+ // { NS_VK_JUNJA, GDK_XXX }, -+ // { NS_VK_FINAL, GDK_XXX }, -+ { NS_VK_HANJA, GDK_Hangul_Hanja }, -+ { NS_VK_KANJI, GDK_Kanji }, -+ { NS_VK_ESCAPE, GDK_Escape }, -+ { NS_VK_CONVERT, GDK_Henkan }, -+ { NS_VK_NONCONVERT, GDK_Muhenkan }, -+ // { NS_VK_ACCEPT, GDK_XXX }, -+ // { NS_VK_MODECHANGE, GDK_XXX }, -+ { NS_VK_SPACE, GDK_space }, -+ { NS_VK_PAGE_UP, GDK_Page_Up }, -+ { NS_VK_PAGE_DOWN, GDK_Page_Down }, -+ { NS_VK_END, GDK_End }, -+ { NS_VK_HOME, GDK_Home }, -+ { NS_VK_LEFT, GDK_Left }, -+ { NS_VK_UP, GDK_Up }, -+ { NS_VK_RIGHT, GDK_Right }, -+ { NS_VK_DOWN, GDK_Down }, -+ { NS_VK_SELECT, GDK_Select }, -+ { NS_VK_PRINT, GDK_Print }, -+ { NS_VK_EXECUTE, GDK_Execute }, -+ { NS_VK_PRINTSCREEN, GDK_Print }, -+ { NS_VK_INSERT, GDK_Insert }, -+ { NS_VK_DELETE, GDK_Delete }, -+ { NS_VK_HELP, GDK_Help }, -+ -+ // keypad keys -+ { NS_VK_LEFT, GDK_KP_Left }, -+ { NS_VK_RIGHT, GDK_KP_Right }, -+ { NS_VK_UP, GDK_KP_Up }, -+ { NS_VK_DOWN, GDK_KP_Down }, -+ { NS_VK_PAGE_UP, GDK_KP_Page_Up }, -+ // Not sure what these are -+ //{ NS_VK_, GDK_KP_Prior }, -+ //{ NS_VK_, GDK_KP_Next }, -+ { NS_VK_CLEAR, GDK_KP_Begin }, // Num-unlocked 5 -+ { NS_VK_PAGE_DOWN, GDK_KP_Page_Down }, -+ { NS_VK_HOME, GDK_KP_Home }, -+ { NS_VK_END, GDK_KP_End }, -+ { NS_VK_INSERT, GDK_KP_Insert }, -+ { NS_VK_DELETE, GDK_KP_Delete }, -+ { NS_VK_RETURN, GDK_KP_Enter }, -+ -+ { NS_VK_NUM_LOCK, GDK_Num_Lock }, -+ { NS_VK_SCROLL_LOCK,GDK_Scroll_Lock }, -+ -+ // Function keys -+ { NS_VK_F1, GDK_F1 }, -+ { NS_VK_F2, GDK_F2 }, -+ { NS_VK_F3, GDK_F3 }, -+ { NS_VK_F4, GDK_F4 }, -+ { NS_VK_F5, GDK_F5 }, -+ { NS_VK_F6, GDK_F6 }, -+ { NS_VK_F7, GDK_F7 }, -+ { NS_VK_F8, GDK_F8 }, -+ { NS_VK_F9, GDK_F9 }, -+ { NS_VK_F10, GDK_F10 }, -+ { NS_VK_F11, GDK_F11 }, -+ { NS_VK_F12, GDK_F12 }, -+ { NS_VK_F13, GDK_F13 }, -+ { NS_VK_F14, GDK_F14 }, -+ { NS_VK_F15, GDK_F15 }, -+ { NS_VK_F16, GDK_F16 }, -+ { NS_VK_F17, GDK_F17 }, -+ { NS_VK_F18, GDK_F18 }, -+ { NS_VK_F19, GDK_F19 }, -+ { NS_VK_F20, GDK_F20 }, -+ { NS_VK_F21, GDK_F21 }, -+ { NS_VK_F22, GDK_F22 }, -+ { NS_VK_F23, GDK_F23 }, -+ { NS_VK_F24, GDK_F24 }, -+ -+ // context menu key, keysym 0xff67, typically keycode 117 on 105-key (Microsoft) -+ // x86 keyboards, located between right 'Windows' key and right Ctrl key -+ { NS_VK_CONTEXT_MENU, GDK_Menu }, -+ { NS_VK_SLEEP, GDK_Sleep }, -+ -+ { NS_VK_ATTN, GDK_3270_Attn }, -+ { NS_VK_CRSEL, GDK_3270_CursorSelect }, -+ { NS_VK_EXSEL, GDK_3270_ExSelect }, -+ { NS_VK_EREOF, GDK_3270_EraseEOF }, -+ { NS_VK_PLAY, GDK_3270_Play }, -+ //{ NS_VK_ZOOM, GDK_XXX }, -+ { NS_VK_PA1, GDK_3270_PA1 }, -+}; -+ -+static guint -+ConvertGeckoKeyNameToGDKKeyval(nsAString& aKeyName) -+{ -+ NS_ConvertUTF16toUTF8 keyName(aKeyName); -+ ToUpperCase(keyName); // We want case-insensitive comparison with data -+ // stored as uppercase. -+ -+ uint32_t keyCode = 0; -+ -+ uint32_t keyNameLength = keyName.Length(); -+ const char* keyNameStr = keyName.get(); -+ for (uint16_t i = 0; i < ArrayLength(gKeyCodes); ++i) { -+ if (keyNameLength == gKeyCodes[i].strlength && -+ !nsCRT::strcmp(gKeyCodes[i].str, keyNameStr)) { -+ keyCode = gKeyCodes[i].keycode; -+ break; -+ } -+ } -+ -+ // First, try to handle alphanumeric input, not listed in nsKeycodes: -+ // most likely, more letters will be getting typed in than things in -+ // the key list, so we will look through these first. -+ -+ if (keyCode >= NS_VK_A && keyCode <= NS_VK_Z) { -+ // gdk and DOM both use the ASCII codes for these keys. -+ return keyCode; -+ } -+ -+ // numbers -+ if (keyCode >= NS_VK_0 && keyCode <= NS_VK_9) { -+ // gdk and DOM both use the ASCII codes for these keys. -+ return keyCode - NS_VK_0 + GDK_0; -+ } -+ -+ switch (keyCode) { -+ // keys in numpad -+ case NS_VK_MULTIPLY: return GDK_KP_Multiply; -+ case NS_VK_ADD: return GDK_KP_Add; -+ case NS_VK_SEPARATOR: return GDK_KP_Separator; -+ case NS_VK_SUBTRACT: return GDK_KP_Subtract; -+ case NS_VK_DECIMAL: return GDK_KP_Decimal; -+ case NS_VK_DIVIDE: return GDK_KP_Divide; -+ case NS_VK_NUMPAD0: return GDK_KP_0; -+ case NS_VK_NUMPAD1: return GDK_KP_1; -+ case NS_VK_NUMPAD2: return GDK_KP_2; -+ case NS_VK_NUMPAD3: return GDK_KP_3; -+ case NS_VK_NUMPAD4: return GDK_KP_4; -+ case NS_VK_NUMPAD5: return GDK_KP_5; -+ case NS_VK_NUMPAD6: return GDK_KP_6; -+ case NS_VK_NUMPAD7: return GDK_KP_7; -+ case NS_VK_NUMPAD8: return GDK_KP_8; -+ case NS_VK_NUMPAD9: return GDK_KP_9; -+ // other prinable keys -+ case NS_VK_SPACE: return GDK_space; -+ case NS_VK_COLON: return GDK_colon; -+ case NS_VK_SEMICOLON: return GDK_semicolon; -+ case NS_VK_LESS_THAN: return GDK_less; -+ case NS_VK_EQUALS: return GDK_equal; -+ case NS_VK_GREATER_THAN: return GDK_greater; -+ case NS_VK_QUESTION_MARK: return GDK_question; -+ case NS_VK_AT: return GDK_at; -+ case NS_VK_CIRCUMFLEX: return GDK_asciicircum; -+ case NS_VK_EXCLAMATION: return GDK_exclam; -+ case NS_VK_DOUBLE_QUOTE: return GDK_quotedbl; -+ case NS_VK_HASH: return GDK_numbersign; -+ case NS_VK_DOLLAR: return GDK_dollar; -+ case NS_VK_PERCENT: return GDK_percent; -+ case NS_VK_AMPERSAND: return GDK_ampersand; -+ case NS_VK_UNDERSCORE: return GDK_underscore; -+ case NS_VK_OPEN_PAREN: return GDK_parenleft; -+ case NS_VK_CLOSE_PAREN: return GDK_parenright; -+ case NS_VK_ASTERISK: return GDK_asterisk; -+ case NS_VK_PLUS: return GDK_plus; -+ case NS_VK_PIPE: return GDK_bar; -+ case NS_VK_HYPHEN_MINUS: return GDK_minus; -+ case NS_VK_OPEN_CURLY_BRACKET: return GDK_braceleft; -+ case NS_VK_CLOSE_CURLY_BRACKET: return GDK_braceright; -+ case NS_VK_TILDE: return GDK_asciitilde; -+ case NS_VK_COMMA: return GDK_comma; -+ case NS_VK_PERIOD: return GDK_period; -+ case NS_VK_SLASH: return GDK_slash; -+ case NS_VK_BACK_QUOTE: return GDK_grave; -+ case NS_VK_OPEN_BRACKET: return GDK_bracketleft; -+ case NS_VK_BACK_SLASH: return GDK_backslash; -+ case NS_VK_CLOSE_BRACKET: return GDK_bracketright; -+ case NS_VK_QUOTE: return GDK_apostrophe; -+ } -+ -+ // misc other things -+ for (uint32_t i = 0; i < ArrayLength(gKeyPairs); ++i) { -+ if (gKeyPairs[i].DOMKeyCode == keyCode) { -+ return gKeyPairs[i].GDKKeyval; -+ } -+ } -+ -+ return 0; -+} -+ -+class nsMenuItemUncheckSiblingsRunnable final : public Runnable -+{ -+public: -+ NS_IMETHODIMP Run() -+ { -+ if (mMenuItem) { -+ static_cast<nsMenuItem *>(mMenuItem.get())->UncheckSiblings(); -+ } -+ return NS_OK; -+ } -+ -+ nsMenuItemUncheckSiblingsRunnable(nsMenuItem *aMenuItem) : -+ Runnable("nsMenuItemUncheckSiblingsRunnable"), -+ mMenuItem(aMenuItem) { }; -+ -+private: -+ nsWeakMenuObject mMenuItem; -+}; -+ -+bool -+nsMenuItem::IsCheckboxOrRadioItem() const -+{ -+ return mType == eMenuItemType_Radio || -+ mType == eMenuItemType_CheckBox; -+} -+ -+/* static */ void -+nsMenuItem::item_activated_cb(DbusmenuMenuitem *menuitem, -+ guint timestamp, -+ gpointer user_data) -+{ -+ nsMenuItem *item = static_cast<nsMenuItem *>(user_data); -+ item->Activate(timestamp); -+} -+ -+void -+nsMenuItem::Activate(uint32_t aTimestamp) -+{ -+ GdkWindow *window = gtk_widget_get_window(MenuBar()->TopLevelWindow()); -+ gdk_x11_window_set_user_time( -+ window, std::min(aTimestamp, gdk_x11_get_server_time(window))); -+ -+ // We do this to avoid mutating our view of the menu until -+ // after we have finished -+ nsNativeMenuDocListener::BlockUpdatesScope updatesBlocker; -+ -+ if (!ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::autocheck, -+ nsGkAtoms::_false, -+ eCaseMatters) && -+ (mType == eMenuItemType_CheckBox || -+ (mType == eMenuItemType_Radio && !mIsChecked))) { -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, -+ nsGkAtoms::checked, -+ mIsChecked ? -+ u"false"_ns -+ : u"true"_ns, -+ true); -+ } -+ -+ dom::Document *doc = ContentNode()->OwnerDoc(); -+ ErrorResult rv; -+ RefPtr<dom::Event> event = -+ doc->CreateEvent(u"xulcommandevent"_ns, -+ dom::CallerType::System, rv); -+ if (!rv.Failed()) { -+ RefPtr<dom::XULCommandEvent> command = event->AsXULCommandEvent(); -+ if (command) { -+ command->InitCommandEvent(u"command"_ns, true, true, -+ nsGlobalWindowInner::Cast(doc->GetInnerWindow()), -+ 0, false, false, false, false, 0, nullptr, 0, rv); -+ if (!rv.Failed()) { -+ event->SetTrusted(true); -+ ContentNode()->DispatchEvent(*event, rv); -+ if (rv.Failed()) { -+ NS_WARNING("Failed to dispatch event"); -+ rv.SuppressException(); -+ } -+ } else { -+ NS_WARNING("Failed to initialize command event"); -+ rv.SuppressException(); -+ } -+ } -+ } else { -+ NS_WARNING("CreateEvent failed"); -+ rv.SuppressException(); -+ } -+ -+ // This kinda sucks, but Unity doesn't send a closed event -+ // after activating a menuitem -+ nsMenuObject *ancestor = Parent(); -+ while (ancestor && ancestor->Type() == eType_Menu) { -+ static_cast<nsMenu *>(ancestor)->OnClose(); -+ ancestor = ancestor->Parent(); -+ } -+} -+ -+void -+nsMenuItem::CopyAttrFromNodeIfExists(nsIContent *aContent, nsAtom *aAttribute) -+{ -+ nsAutoString value; -+ if (aContent->AsElement()->GetAttr(kNameSpaceID_None, aAttribute, value)) { -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, aAttribute, -+ value, true); -+ } -+} -+ -+void -+nsMenuItem::UpdateState() -+{ -+ if (!IsCheckboxOrRadioItem()) { -+ return; -+ } -+ -+ mIsChecked = ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::checked, -+ nsGkAtoms::_true, -+ eCaseMatters); -+ dbusmenu_menuitem_property_set_int(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, -+ mIsChecked ? -+ DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : -+ DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); -+} -+ -+void -+nsMenuItem::UpdateTypeAndState() -+{ -+ static mozilla::dom::Element::AttrValuesArray attrs[] = -+ { nsGkAtoms::checkbox, nsGkAtoms::radio, nullptr }; -+ int32_t type = ContentNode()->AsElement()->FindAttrValueIn(kNameSpaceID_None, -+ nsGkAtoms::type, -+ attrs, eCaseMatters); -+ -+ if (type >= 0 && type < 2) { -+ if (type == 0) { -+ dbusmenu_menuitem_property_set(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, -+ DBUSMENU_MENUITEM_TOGGLE_CHECK); -+ mType = eMenuItemType_CheckBox; -+ } else if (type == 1) { -+ dbusmenu_menuitem_property_set(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, -+ DBUSMENU_MENUITEM_TOGGLE_RADIO); -+ mType = eMenuItemType_Radio; -+ } -+ -+ UpdateState(); -+ } else { -+ dbusmenu_menuitem_property_remove(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE); -+ dbusmenu_menuitem_property_remove(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_TOGGLE_STATE); -+ mType = eMenuItemType_Normal; -+ } -+} -+ -+void -+nsMenuItem::UpdateAccel() -+{ -+ dom::Document *doc = ContentNode()->GetUncomposedDoc(); -+ if (doc) { -+ nsCOMPtr<nsIContent> oldKeyContent; -+ oldKeyContent.swap(mKeyContent); -+ -+ nsAutoString key; -+ ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::key, -+ key); -+ if (!key.IsEmpty()) { -+ mKeyContent = doc->GetElementById(key); -+ } -+ -+ if (mKeyContent != oldKeyContent) { -+ if (oldKeyContent) { -+ DocListener()->UnregisterForContentChanges(oldKeyContent); -+ } -+ if (mKeyContent) { -+ DocListener()->RegisterForContentChanges(mKeyContent, this); -+ } -+ } -+ } -+ -+ if (!mKeyContent) { -+ dbusmenu_menuitem_property_remove(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_SHORTCUT); -+ return; -+ } -+ -+ nsAutoString modifiers; -+ mKeyContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::modifiers, -+ modifiers); -+ -+ uint32_t modifier = 0; -+ -+ if (!modifiers.IsEmpty()) { -+ char* str = ToNewUTF8String(modifiers); -+ char *token = strtok(str, ", \t"); -+ while(token) { -+ if (nsCRT::strcmp(token, "shift") == 0) { -+ modifier |= GDK_SHIFT_MASK; -+ } else if (nsCRT::strcmp(token, "alt") == 0) { -+ modifier |= GDK_MOD1_MASK; -+ } else if (nsCRT::strcmp(token, "meta") == 0) { -+ modifier |= GDK_META_MASK; -+ } else if (nsCRT::strcmp(token, "control") == 0) { -+ modifier |= GDK_CONTROL_MASK; -+ } else if (nsCRT::strcmp(token, "accel") == 0) { -+ int32_t accel = Preferences::GetInt("ui.key.accelKey"); -+ if (accel == dom::KeyboardEvent_Binding::DOM_VK_META) { -+ modifier |= GDK_META_MASK; -+ } else if (accel == dom::KeyboardEvent_Binding::DOM_VK_ALT) { -+ modifier |= GDK_MOD1_MASK; -+ } else { -+ modifier |= GDK_CONTROL_MASK; -+ } -+ } -+ -+ token = strtok(nullptr, ", \t"); -+ } -+ -+ free(str); -+ } -+ -+ nsAutoString keyStr; -+ mKeyContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::key, -+ keyStr); -+ -+ guint key = 0; -+ if (!keyStr.IsEmpty()) { -+ key = gdk_unicode_to_keyval(*keyStr.BeginReading()); -+ } -+ -+ if (key == 0) { -+ mKeyContent->AsElement()->GetAttr(kNameSpaceID_None, -+ nsGkAtoms::keycode, keyStr); -+ if (!keyStr.IsEmpty()) { -+ key = ConvertGeckoKeyNameToGDKKeyval(keyStr); -+ } -+ } -+ -+ if (key == 0) { -+ key = GDK_VoidSymbol; -+ } -+ -+ if (key != GDK_VoidSymbol) { -+ dbusmenu_menuitem_property_set_shortcut(GetNativeData(), key, -+ static_cast<GdkModifierType>(modifier)); -+ } else { -+ dbusmenu_menuitem_property_remove(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_SHORTCUT); -+ } -+} -+ -+nsMenuBar* -+nsMenuItem::MenuBar() -+{ -+ nsMenuObject *tmp = this; -+ while (tmp->Parent()) { -+ tmp = tmp->Parent(); -+ } -+ -+ MOZ_ASSERT(tmp->Type() == eType_MenuBar, "The top-level should be a menubar"); -+ -+ return static_cast<nsMenuBar *>(tmp); -+} -+ -+void -+nsMenuItem::UncheckSiblings() -+{ -+ if (!ContentNode()->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::type, -+ nsGkAtoms::radio, -+ eCaseMatters)) { -+ // If we're not a radio button, we don't care -+ return; -+ } -+ -+ nsAutoString name; -+ ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::name, -+ name); -+ -+ nsIContent *parent = ContentNode()->GetParent(); -+ if (!parent) { -+ return; -+ } -+ -+ uint32_t count = parent->GetChildCount(); -+ for (uint32_t i = 0; i < count; ++i) { -+ nsIContent *sibling = parent->GetChildAt_Deprecated(i); -+ -+ if (sibling->IsComment()) { -+ continue; -+ } -+ -+ nsAutoString otherName; -+ sibling->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::name, -+ otherName); -+ -+ if (sibling != ContentNode() && otherName == name && -+ sibling->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::type, -+ nsGkAtoms::radio, -+ eCaseMatters)) { -+ sibling->AsElement()->UnsetAttr(kNameSpaceID_None, -+ nsGkAtoms::checked, true); -+ } -+ } -+} -+ -+void -+nsMenuItem::InitializeNativeData() -+{ -+ g_signal_connect(G_OBJECT(GetNativeData()), -+ DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, -+ G_CALLBACK(item_activated_cb), this); -+ mNeedsUpdate = true; -+} -+ -+void -+nsMenuItem::UpdateContentAttributes() -+{ -+ dom::Document *doc = ContentNode()->GetUncomposedDoc(); -+ if (!doc) { -+ return; -+ } -+ -+ nsAutoString command; -+ ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::command, -+ command); -+ if (command.IsEmpty()) { -+ return; -+ } -+ -+ nsCOMPtr<nsIContent> commandContent = doc->GetElementById(command); -+ if (!commandContent) { -+ return; -+ } -+ -+ if (commandContent->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::disabled, -+ nsGkAtoms::_true, -+ eCaseMatters)) { -+ ContentNode()->AsElement()->SetAttr(kNameSpaceID_None, -+ nsGkAtoms::disabled, -+ u"true"_ns, true); -+ } else { -+ ContentNode()->AsElement()->UnsetAttr(kNameSpaceID_None, -+ nsGkAtoms::disabled, true); -+ } -+ -+ CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::checked); -+ CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::accesskey); -+ CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::label); -+ CopyAttrFromNodeIfExists(commandContent, nsGkAtoms::hidden); -+} -+ -+void -+nsMenuItem::Update(const ComputedStyle *aComputedStyle) -+{ -+ if (mNeedsUpdate) { -+ mNeedsUpdate = false; -+ -+ UpdateTypeAndState(); -+ UpdateAccel(); -+ UpdateLabel(); -+ UpdateSensitivity(); -+ } -+ -+ UpdateVisibility(aComputedStyle); -+ UpdateIcon(aComputedStyle); -+} -+ -+bool -+nsMenuItem::IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const -+{ -+ return nsCRT::strcmp(dbusmenu_menuitem_property_get(aNativeData, -+ DBUSMENU_MENUITEM_PROP_TYPE), -+ "separator") != 0; -+} -+ -+nsMenuObject::PropertyFlags -+nsMenuItem::SupportedProperties() const -+{ -+ return static_cast<nsMenuObject::PropertyFlags>( -+ nsMenuObject::ePropLabel | -+ nsMenuObject::ePropEnabled | -+ nsMenuObject::ePropVisible | -+ nsMenuObject::ePropIconData | -+ nsMenuObject::ePropShortcut | -+ nsMenuObject::ePropToggleType | -+ nsMenuObject::ePropToggleState -+ ); -+} -+ -+void -+nsMenuItem::OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) -+{ -+ MOZ_ASSERT(aContent == ContentNode() || aContent == mKeyContent, -+ "Received an event that wasn't meant for us!"); -+ -+ if (aContent == ContentNode() && aAttribute == nsGkAtoms::checked && -+ aContent->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::checked, -+ nsGkAtoms::_true, eCaseMatters)) { -+ nsContentUtils::AddScriptRunner( -+ new nsMenuItemUncheckSiblingsRunnable(this)); -+ } -+ -+ if (mNeedsUpdate) { -+ return; -+ } -+ -+ if (!Parent()->IsBeingDisplayed()) { -+ mNeedsUpdate = true; -+ return; -+ } -+ -+ if (aContent == ContentNode()) { -+ if (aAttribute == nsGkAtoms::key) { -+ UpdateAccel(); -+ } else if (aAttribute == nsGkAtoms::label || -+ aAttribute == nsGkAtoms::accesskey || -+ aAttribute == nsGkAtoms::crop) { -+ UpdateLabel(); -+ } else if (aAttribute == nsGkAtoms::disabled) { -+ UpdateSensitivity(); -+ } else if (aAttribute == nsGkAtoms::type) { -+ UpdateTypeAndState(); -+ } else if (aAttribute == nsGkAtoms::checked) { -+ UpdateState(); -+ } else if (aAttribute == nsGkAtoms::hidden || -+ aAttribute == nsGkAtoms::collapsed) { -+ RefPtr<const ComputedStyle> style = GetComputedStyle(); -+ UpdateVisibility(style); -+ } else if (aAttribute == nsGkAtoms::image) { -+ RefPtr<const ComputedStyle> style = GetComputedStyle(); -+ UpdateIcon(style); -+ } -+ } else if (aContent == mKeyContent && -+ (aAttribute == nsGkAtoms::key || -+ aAttribute == nsGkAtoms::keycode || -+ aAttribute == nsGkAtoms::modifiers)) { -+ UpdateAccel(); -+ } -+} -+ -+nsMenuItem::nsMenuItem(nsMenuContainer *aParent, nsIContent *aContent) : -+ nsMenuObject(aParent, aContent), -+ mType(eMenuItemType_Normal), -+ mIsChecked(false), -+ mNeedsUpdate(false) -+{ -+ MOZ_COUNT_CTOR(nsMenuItem); -+} -+ -+nsMenuItem::~nsMenuItem() -+{ -+ if (DocListener() && mKeyContent) { -+ DocListener()->UnregisterForContentChanges(mKeyContent); -+ } -+ -+ if (GetNativeData()) { -+ g_signal_handlers_disconnect_by_func(GetNativeData(), -+ FuncToGpointer(item_activated_cb), -+ this); -+ } -+ -+ MOZ_COUNT_DTOR(nsMenuItem); -+} -+ -+nsMenuObject::EType -+nsMenuItem::Type() const -+{ -+ return eType_MenuItem; -+} ---- /dev/null -+++ b/widget/gtk/nsMenuItem.h -@@ -0,0 +1,80 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsMenuItem_h__ -+#define __nsMenuItem_h__ -+ -+#include "mozilla/Attributes.h" -+#include "nsCOMPtr.h" -+ -+#include "nsDbusmenu.h" -+#include "nsMenuObject.h" -+ -+#include <glib.h> -+ -+class nsAtom; -+class nsIContent; -+class nsMenuBar; -+class nsMenuContainer; -+ -+/* -+ * This class represents 3 main classes of menuitems: labels, checkboxes and -+ * radio buttons (with/without an icon) -+ */ -+class nsMenuItem final : public nsMenuObject -+{ -+public: -+ nsMenuItem(nsMenuContainer *aParent, nsIContent *aContent); -+ ~nsMenuItem() override; -+ -+ nsMenuObject::EType Type() const override; -+ -+private: -+ friend class nsMenuItemUncheckSiblingsRunnable; -+ -+ enum { -+ eMenuItemFlag_ToggleState = (1 << 0) -+ }; -+ -+ enum EMenuItemType { -+ eMenuItemType_Normal, -+ eMenuItemType_Radio, -+ eMenuItemType_CheckBox -+ }; -+ -+ bool IsCheckboxOrRadioItem() const; -+ -+ static void item_activated_cb(DbusmenuMenuitem *menuitem, -+ guint timestamp, -+ gpointer user_data); -+ void Activate(uint32_t aTimestamp); -+ -+ void CopyAttrFromNodeIfExists(nsIContent *aContent, nsAtom *aAtom); -+ void UpdateState(); -+ void UpdateTypeAndState(); -+ void UpdateAccel(); -+ nsMenuBar* MenuBar(); -+ void UncheckSiblings(); -+ -+ void InitializeNativeData() override; -+ void UpdateContentAttributes() override; -+ void Update(const mozilla::ComputedStyle *aComputedStyle) override; -+ bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override; -+ nsMenuObject::PropertyFlags SupportedProperties() const override; -+ -+ void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override; -+ -+ EMenuItemType mType; -+ -+ bool mIsChecked; -+ -+ bool mNeedsUpdate; -+ -+ nsCOMPtr<nsIContent> mKeyContent; -+}; -+ -+#endif /* __nsMenuItem_h__ */ ---- /dev/null -+++ b/widget/gtk/nsMenuObject.cpp -@@ -0,0 +1,653 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "ImageOps.h" -+#include "imgIContainer.h" -+#include "imgINotificationObserver.h" -+#include "imgLoader.h" -+#include "imgRequestProxy.h" -+#include "mozilla/ArrayUtils.h" -+#include "mozilla/Assertions.h" -+#include "mozilla/dom/Document.h" -+#include "mozilla/dom/Element.h" -+#include "mozilla/Preferences.h" -+#include "mozilla/PresShell.h" -+#include "mozilla/PresShellInlines.h" -+#include "mozilla/GRefPtr.h" -+#include "nsAttrValue.h" -+#include "nsComputedDOMStyle.h" -+#include "nsContentUtils.h" -+#include "nsGkAtoms.h" -+#include "nsIContent.h" -+#include "nsIContentPolicy.h" -+#include "nsILoadGroup.h" -+#include "nsImageToPixbuf.h" -+#include "nsIURI.h" -+#include "nsNetUtil.h" -+#include "nsPresContext.h" -+#include "nsRect.h" -+#include "nsServiceManagerUtils.h" -+#include "nsString.h" -+#include "nsStyleConsts.h" -+#include "nsStyleStruct.h" -+#include "nsUnicharUtils.h" -+ -+#include "nsMenuContainer.h" -+#include "nsNativeMenuDocListener.h" -+ -+#include <gdk/gdk.h> -+#include <glib-object.h> -+#include <pango/pango.h> -+ -+#include "nsMenuObject.h" -+ -+// X11's None clashes with StyleDisplay::None -+#include "X11UndefineNone.h" -+ -+#undef None -+ -+using namespace mozilla; -+using mozilla::image::ImageOps; -+ -+#define MAX_WIDTH 350000 -+ -+const char *gPropertyStrings[] = { -+#define DBUSMENU_PROPERTY(e, s, b) s, -+ DBUSMENU_PROPERTIES -+#undef DBUSMENU_PROPERTY -+ nullptr -+}; -+ -+nsWeakMenuObject* nsWeakMenuObject::sHead; -+PangoLayout* gPangoLayout = nullptr; -+ -+class nsMenuObjectIconLoader final : public imgINotificationObserver -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_IMGINOTIFICATIONOBSERVER -+ -+ nsMenuObjectIconLoader(nsMenuObject *aOwner) : mOwner(aOwner) { }; -+ -+ void LoadIcon(const ComputedStyle *aComputedStyle); -+ void Destroy(); -+ -+private: -+ ~nsMenuObjectIconLoader() { }; -+ -+ nsMenuObject *mOwner; -+ RefPtr<imgRequestProxy> mImageRequest; -+ nsCOMPtr<nsIURI> mURI; -+}; -+ -+NS_IMPL_ISUPPORTS(nsMenuObjectIconLoader, imgINotificationObserver) -+ -+void -+nsMenuObjectIconLoader::Notify(imgIRequest *aProxy, -+ int32_t aType, const nsIntRect *aRect) -+{ -+ if (!mOwner) { -+ return; -+ } -+ -+ if (aProxy != mImageRequest) { -+ return; -+ } -+ -+ if (aType == imgINotificationObserver::LOAD_COMPLETE) { -+ uint32_t status = imgIRequest::STATUS_ERROR; -+ if (NS_FAILED(mImageRequest->GetImageStatus(&status)) || -+ (status & imgIRequest::STATUS_ERROR)) { -+ mImageRequest->Cancel(NS_BINDING_ABORTED); -+ mImageRequest = nullptr; -+ return; -+ } -+ -+ nsCOMPtr<imgIContainer> image; -+ mImageRequest->GetImage(getter_AddRefs(image)); -+ MOZ_ASSERT(image); -+ -+ // Ask the image to decode at its intrinsic size. -+ int32_t width = 0, height = 0; -+ image->GetWidth(&width); -+ image->GetHeight(&height); -+ image->RequestDecodeForSize(nsIntSize(width, height), imgIContainer::FLAG_NONE); -+ return; -+ } -+ -+ if (aType == imgINotificationObserver::DECODE_COMPLETE) { -+ mImageRequest->Cancel(NS_BINDING_ABORTED); -+ mImageRequest = nullptr; -+ return; -+ } -+ -+ if (aType != imgINotificationObserver::FRAME_COMPLETE) { -+ return; -+ } -+ -+ nsCOMPtr<imgIContainer> img; -+ mImageRequest->GetImage(getter_AddRefs(img)); -+ if (!img) { -+ return; -+ } -+ -+ int32_t width, height; -+ img->GetWidth(&width); -+ img->GetHeight(&height); -+ -+ if (width <= 0 || height <= 0) { -+ mOwner->ClearIcon(); -+ return; -+ } -+ -+ if (width > 100 || height > 100) { -+ // The icon data needs to go across DBus. Make sure the icon -+ // data isn't too large, else our connection gets terminated and -+ // GDbus helpfully aborts the application. Thank you :) -+ NS_WARNING("Icon data too large"); -+ mOwner->ClearIcon(); -+ return; -+ } -+ -+ RefPtr<GdkPixbuf> pixbuf = nsImageToPixbuf::ImageToPixbuf(img); -+ if (pixbuf) { -+ dbusmenu_menuitem_property_set_image(mOwner->GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_ICON_DATA, -+ pixbuf); -+ } -+ -+ return; -+} -+ -+void -+nsMenuObjectIconLoader::LoadIcon(const ComputedStyle *aComputedStyle) -+{ -+ dom::Document *doc = mOwner->ContentNode()->OwnerDoc(); -+ -+ nsCOMPtr<nsIURI> uri; -+ imgRequestProxy *imageRequest = nullptr; -+ -+ nsAutoString uriString; -+ if (mOwner->ContentNode()->AsElement()->GetAttr(kNameSpaceID_None, -+ nsGkAtoms::image, -+ uriString)) { -+ NS_NewURI(getter_AddRefs(uri), uriString); -+ } else { -+ PresShell *shell = doc->GetPresShell(); -+ if (!shell) { -+ return; -+ } -+ -+ nsPresContext *pc = shell->GetPresContext(); -+ if (!pc || !aComputedStyle) { -+ return; -+ } -+ -+ const nsStyleList *list = aComputedStyle->StyleList(); -+ imageRequest = list->mListStyleImage.GetImageRequest(); -+ if (imageRequest) { -+ imageRequest->GetURI(getter_AddRefs(uri)); -+ } -+ } -+ -+ if (!uri) { -+ mOwner->ClearIcon(); -+ mURI = nullptr; -+ -+ if (mImageRequest) { -+ mImageRequest->Cancel(NS_BINDING_ABORTED); -+ mImageRequest = nullptr; -+ } -+ -+ return; -+ } -+ -+ bool same; -+ if (mURI && NS_SUCCEEDED(mURI->Equals(uri, &same)) && same && -+ !imageRequest) { -+ return; -+ } -+ -+ if (mImageRequest) { -+ mImageRequest->Cancel(NS_BINDING_ABORTED); -+ mImageRequest = nullptr; -+ } -+ -+ mURI = uri; -+ -+ if (imageRequest) { -+ imageRequest->Clone(this, nullptr, getter_AddRefs(mImageRequest)); -+ } else { -+ nsCOMPtr<nsILoadGroup> loadGroup = doc->GetDocumentLoadGroup(); -+ RefPtr<imgLoader> loader = -+ nsContentUtils::GetImgLoaderForDocument(doc); -+ if (!loader || !loadGroup) { -+ NS_WARNING("Failed to get loader or load group for image load"); -+ return; -+ } -+ -+ loader->LoadImage(uri, nullptr, nullptr, -+ nullptr, 0, loadGroup, this, nullptr, nullptr, -+ nsIRequest::LOAD_NORMAL, nullptr, -+ nsIContentPolicy::TYPE_IMAGE, EmptyString(), -+ false, false, 0, getter_AddRefs(mImageRequest)); -+ } -+} -+ -+void -+nsMenuObjectIconLoader::Destroy() -+{ -+ if (mImageRequest) { -+ mImageRequest->CancelAndForgetObserver(NS_BINDING_ABORTED); -+ mImageRequest = nullptr; -+ } -+ -+ mOwner = nullptr; -+} -+ -+static int -+CalculateTextWidth(const nsAString& aText) -+{ -+ if (!gPangoLayout) { -+ PangoFontMap *fontmap = pango_cairo_font_map_get_default(); -+ PangoContext *ctx = pango_font_map_create_context(fontmap); -+ gPangoLayout = pango_layout_new(ctx); -+ g_object_unref(ctx); -+ } -+ -+ pango_layout_set_text(gPangoLayout, NS_ConvertUTF16toUTF8(aText).get(), -1); -+ -+ int width, dummy; -+ pango_layout_get_size(gPangoLayout, &width, &dummy); -+ -+ return width; -+} -+ -+static const nsDependentString -+GetEllipsis() -+{ -+ static char16_t sBuf[4] = { 0, 0, 0, 0 }; -+ if (!sBuf[0]) { -+ nsString ellipsis; -+ Preferences::GetLocalizedString("intl.ellipsis", ellipsis); -+ if (!ellipsis.IsEmpty()) { -+ uint32_t l = ellipsis.Length(); -+ const nsString::char_type *c = ellipsis.BeginReading(); -+ uint32_t i = 0; -+ while (i < 3 && i < l) { -+ sBuf[i++] = *(c++); -+ } -+ } else { -+ sBuf[0] = '.'; -+ sBuf[1] = '.'; -+ sBuf[2] = '.'; -+ } -+ } -+ -+ return nsDependentString(sBuf); -+} -+ -+static int -+GetEllipsisWidth() -+{ -+ static int sEllipsisWidth = -1; -+ -+ if (sEllipsisWidth == -1) { -+ sEllipsisWidth = CalculateTextWidth(GetEllipsis()); -+ } -+ -+ return sEllipsisWidth; -+} -+ -+nsMenuObject::nsMenuObject(nsMenuContainer *aParent, nsIContent *aContent) : -+ mContent(aContent), -+ mListener(aParent->DocListener()), -+ mParent(aParent), -+ mNativeData(nullptr) -+{ -+ MOZ_ASSERT(mContent); -+ MOZ_ASSERT(mListener); -+ MOZ_ASSERT(mParent); -+} -+ -+nsMenuObject::nsMenuObject(nsNativeMenuDocListener *aListener, -+ nsIContent *aContent) : -+ mContent(aContent), -+ mListener(aListener), -+ mParent(nullptr), -+ mNativeData(nullptr) -+{ -+ MOZ_ASSERT(mContent); -+ MOZ_ASSERT(mListener); -+} -+ -+void -+nsMenuObject::UpdateLabel() -+{ -+ // Gecko stores the label and access key in separate attributes -+ // so we need to convert label="Foo_Bar"/accesskey="F" in to -+ // label="_Foo__Bar" for dbusmenu -+ -+ nsAutoString label; -+ mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::label, label); -+ -+ nsAutoString accesskey; -+ mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::accesskey, -+ accesskey); -+ -+ const nsAutoString::char_type *akey = accesskey.BeginReading(); -+ char16_t keyLower = ToLowerCase(*akey); -+ char16_t keyUpper = ToUpperCase(*akey); -+ -+ const nsAutoString::char_type *iter = label.BeginReading(); -+ const nsAutoString::char_type *end = label.EndReading(); -+ uint32_t length = label.Length(); -+ uint32_t pos = 0; -+ bool foundAccessKey = false; -+ -+ while (iter != end) { -+ if (*iter != char16_t('_')) { -+ if ((*iter != keyLower && *iter != keyUpper) || foundAccessKey) { -+ ++iter; -+ ++pos; -+ continue; -+ } -+ foundAccessKey = true; -+ } -+ -+ label.SetLength(++length); -+ -+ iter = label.BeginReading() + pos; -+ end = label.EndReading(); -+ nsAutoString::char_type *cur = label.BeginWriting() + pos; -+ -+ memmove(cur + 1, cur, (length - 1 - pos) * sizeof(nsAutoString::char_type)); -+ *cur = nsAutoString::char_type('_'); -+ -+ iter += 2; -+ pos += 2; -+ } -+ -+ if (CalculateTextWidth(label) <= MAX_WIDTH) { -+ dbusmenu_menuitem_property_set(mNativeData, -+ DBUSMENU_MENUITEM_PROP_LABEL, -+ NS_ConvertUTF16toUTF8(label).get()); -+ return; -+ } -+ -+ // This sucks. -+ // This should be done at the point where the menu is drawn (hello Unity), -+ // but unfortunately it doesn't do that and will happily fill your entire -+ // screen width with a menu if you have a bookmark with a really long title. -+ // This leaves us with no other option but to ellipsize here, with no proper -+ // knowledge of Unity's render path, font size etc. This is better than nothing -+ nsAutoString truncated; -+ int target = MAX_WIDTH - GetEllipsisWidth(); -+ length = label.Length(); -+ -+ static mozilla::dom::Element::AttrValuesArray strings[] = { -+ nsGkAtoms::left, nsGkAtoms::start, -+ nsGkAtoms::center, nsGkAtoms::right, -+ nsGkAtoms::end, nullptr -+ }; -+ -+ int32_t type = mContent->AsElement()->FindAttrValueIn(kNameSpaceID_None, -+ nsGkAtoms::crop, -+ strings, eCaseMatters); -+ -+ switch (type) { -+ case 0: -+ case 1: -+ // FIXME: Implement left cropping -+ case 2: -+ // FIXME: Implement center cropping -+ case 3: -+ case 4: -+ default: -+ for (uint32_t i = 0; i < length; i++) { -+ truncated.Append(label.CharAt(i)); -+ if (CalculateTextWidth(truncated) > target) { -+ break; -+ } -+ } -+ -+ truncated.Append(GetEllipsis()); -+ } -+ -+ dbusmenu_menuitem_property_set(mNativeData, -+ DBUSMENU_MENUITEM_PROP_LABEL, -+ NS_ConvertUTF16toUTF8(truncated).get()); -+} -+ -+void -+nsMenuObject::UpdateVisibility(const ComputedStyle *aComputedStyle) -+{ -+ bool vis = true; -+ -+ if (aComputedStyle && -+ (aComputedStyle->StyleDisplay()->mDisplay == StyleDisplay::None || -+ aComputedStyle->StyleVisibility()->mVisible == -+ StyleVisibility::Collapse)) { -+ vis = false; -+ } -+ -+ dbusmenu_menuitem_property_set_bool(mNativeData, -+ DBUSMENU_MENUITEM_PROP_VISIBLE, -+ vis); -+} -+ -+void -+nsMenuObject::UpdateSensitivity() -+{ -+ bool disabled = mContent->AsElement()->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::disabled, -+ nsGkAtoms::_true, -+ eCaseMatters); -+ -+ dbusmenu_menuitem_property_set_bool(mNativeData, -+ DBUSMENU_MENUITEM_PROP_ENABLED, -+ !disabled); -+ -+} -+ -+void -+nsMenuObject::UpdateIcon(const ComputedStyle *aComputedStyle) -+{ -+ if (ShouldShowIcon()) { -+ if (!mIconLoader) { -+ mIconLoader = new nsMenuObjectIconLoader(this); -+ } -+ -+ mIconLoader->LoadIcon(aComputedStyle); -+ } else { -+ if (mIconLoader) { -+ mIconLoader->Destroy(); -+ mIconLoader = nullptr; -+ } -+ -+ ClearIcon(); -+ } -+} -+ -+already_AddRefed<const ComputedStyle> -+nsMenuObject::GetComputedStyle() -+{ -+ RefPtr<const ComputedStyle> style = -+ nsComputedDOMStyle::GetComputedStyleNoFlush( -+ mContent->AsElement()); -+ -+ return style.forget(); -+} -+ -+void -+nsMenuObject::InitializeNativeData() -+{ -+} -+ -+nsMenuObject::PropertyFlags -+nsMenuObject::SupportedProperties() const -+{ -+ return static_cast<nsMenuObject::PropertyFlags>(0); -+} -+ -+bool -+nsMenuObject::IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const -+{ -+ return true; -+} -+ -+void -+nsMenuObject::UpdateContentAttributes() -+{ -+} -+ -+void -+nsMenuObject::Update(const ComputedStyle *aComputedStyle) -+{ -+} -+ -+bool -+nsMenuObject::ShouldShowIcon() const -+{ -+ // Ideally we want to know the visibility of the anonymous XUL image in -+ // our menuitem, but this isn't created because we don't have a frame. -+ // The following works by default (because xul.css hides images in menuitems -+ // that don't have the "menuitem-with-favicon" class). It's possible a third -+ // party theme could override this, but, oh well... -+ const nsAttrValue *classes = mContent->AsElement()->GetClasses(); -+ if (!classes) { -+ return false; -+ } -+ -+ for (uint32_t i = 0; i < classes->GetAtomCount(); ++i) { -+ if (classes->AtomAt(i) == nsGkAtoms::menuitem_with_favicon) { -+ return true; -+ } -+ } -+ -+ return false; -+} -+ -+void -+nsMenuObject::ClearIcon() -+{ -+ dbusmenu_menuitem_property_remove(mNativeData, -+ DBUSMENU_MENUITEM_PROP_ICON_DATA); -+} -+ -+nsMenuObject::~nsMenuObject() -+{ -+ nsWeakMenuObject::NotifyDestroyed(this); -+ -+ if (mIconLoader) { -+ mIconLoader->Destroy(); -+ } -+ -+ if (mListener) { -+ mListener->UnregisterForContentChanges(mContent); -+ } -+ -+ if (mNativeData) { -+ g_object_unref(mNativeData); -+ mNativeData = nullptr; -+ } -+} -+ -+void -+nsMenuObject::CreateNativeData() -+{ -+ MOZ_ASSERT(mNativeData == nullptr, "This node already has a DbusmenuMenuitem. The old one will be leaked"); -+ -+ mNativeData = dbusmenu_menuitem_new(); -+ InitializeNativeData(); -+ if (mParent && mParent->IsBeingDisplayed()) { -+ ContainerIsOpening(); -+ } -+ -+ mListener->RegisterForContentChanges(mContent, this); -+} -+ -+nsresult -+nsMenuObject::AdoptNativeData(DbusmenuMenuitem *aNativeData) -+{ -+ MOZ_ASSERT(mNativeData == nullptr, "This node already has a DbusmenuMenuitem. The old one will be leaked"); -+ -+ if (!IsCompatibleWithNativeData(aNativeData)) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ mNativeData = aNativeData; -+ g_object_ref(mNativeData); -+ -+ PropertyFlags supported = SupportedProperties(); -+ PropertyFlags mask = static_cast<PropertyFlags>(1); -+ -+ for (uint32_t i = 0; gPropertyStrings[i]; ++i) { -+ if (!(mask & supported)) { -+ dbusmenu_menuitem_property_remove(mNativeData, gPropertyStrings[i]); -+ } -+ mask = static_cast<PropertyFlags>(mask << 1); -+ } -+ -+ InitializeNativeData(); -+ if (mParent && mParent->IsBeingDisplayed()) { -+ ContainerIsOpening(); -+ } -+ -+ mListener->RegisterForContentChanges(mContent, this); -+ -+ return NS_OK; -+} -+ -+void -+nsMenuObject::ContainerIsOpening() -+{ -+ MOZ_ASSERT(nsContentUtils::IsSafeToRunScript()); -+ -+ UpdateContentAttributes(); -+ -+ RefPtr<const ComputedStyle> style = GetComputedStyle(); -+ Update(style); -+} -+ -+/* static */ void -+nsWeakMenuObject::AddWeakReference(nsWeakMenuObject *aWeak) -+{ -+ aWeak->mPrev = sHead; -+ sHead = aWeak; -+} -+ -+/* static */ void -+nsWeakMenuObject::RemoveWeakReference(nsWeakMenuObject *aWeak) -+{ -+ if (aWeak == sHead) { -+ sHead = aWeak->mPrev; -+ return; -+ } -+ -+ nsWeakMenuObject *weak = sHead; -+ while (weak && weak->mPrev != aWeak) { -+ weak = weak->mPrev; -+ } -+ -+ if (weak) { -+ weak->mPrev = aWeak->mPrev; -+ } -+} -+ -+/* static */ void -+nsWeakMenuObject::NotifyDestroyed(nsMenuObject *aMenuObject) -+{ -+ nsWeakMenuObject *weak = sHead; -+ while (weak) { -+ if (weak->mMenuObject == aMenuObject) { -+ weak->mMenuObject = nullptr; -+ } -+ -+ weak = weak->mPrev; -+ } -+} ---- /dev/null -+++ b/widget/gtk/nsMenuObject.h -@@ -0,0 +1,169 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsMenuObject_h__ -+#define __nsMenuObject_h__ -+ -+#include "mozilla/Attributes.h" -+#include "mozilla/ComputedStyleInlines.h" -+#include "nsCOMPtr.h" -+ -+#include "nsDbusmenu.h" -+#include "nsNativeMenuDocListener.h" -+ -+class nsIContent; -+class nsMenuContainer; -+class nsMenuObjectIconLoader; -+ -+#define DBUSMENU_PROPERTIES \ -+ DBUSMENU_PROPERTY(Label, DBUSMENU_MENUITEM_PROP_LABEL, 0) \ -+ DBUSMENU_PROPERTY(Enabled, DBUSMENU_MENUITEM_PROP_ENABLED, 1) \ -+ DBUSMENU_PROPERTY(Visible, DBUSMENU_MENUITEM_PROP_VISIBLE, 2) \ -+ DBUSMENU_PROPERTY(IconData, DBUSMENU_MENUITEM_PROP_ICON_DATA, 3) \ -+ DBUSMENU_PROPERTY(Type, DBUSMENU_MENUITEM_PROP_TYPE, 4) \ -+ DBUSMENU_PROPERTY(Shortcut, DBUSMENU_MENUITEM_PROP_SHORTCUT, 5) \ -+ DBUSMENU_PROPERTY(ToggleType, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, 6) \ -+ DBUSMENU_PROPERTY(ToggleState, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, 7) \ -+ DBUSMENU_PROPERTY(ChildDisplay, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, 8) -+ -+/* -+ * This is the base class for all menu nodes. Each instance represents -+ * a single node in the menu hierarchy. It wraps the corresponding DOM node and -+ * native menu node, keeps them in sync and transfers events between the two. -+ * It is not reference counted - each node is owned by its parent (the top -+ * level menubar is owned by the window) and keeps a weak pointer to its -+ * parent (which is guaranteed to always be valid because a node will never -+ * outlive its parent). It is not safe to keep a reference to nsMenuObject -+ * externally. -+ */ -+class nsMenuObject : public nsNativeMenuChangeObserver -+{ -+public: -+ enum EType { -+ eType_MenuBar, -+ eType_Menu, -+ eType_MenuItem -+ }; -+ -+ virtual ~nsMenuObject(); -+ -+ // Get the native menu item node -+ DbusmenuMenuitem* GetNativeData() const { return mNativeData; } -+ -+ // Get the parent menu object -+ nsMenuContainer* Parent() const { return mParent; } -+ -+ // Get the content node -+ nsIContent* ContentNode() const { return mContent; } -+ -+ // Get the type of this node. Must be provided by subclasses -+ virtual EType Type() const = 0; -+ -+ // Get the document listener -+ nsNativeMenuDocListener* DocListener() const { return mListener; } -+ -+ // Create the native menu item node (called by containers) -+ void CreateNativeData(); -+ -+ // Adopt the specified native menu item node (called by containers) -+ nsresult AdoptNativeData(DbusmenuMenuitem *aNativeData); -+ -+ // Called by the container to tell us that it's opening -+ void ContainerIsOpening(); -+ -+protected: -+ nsMenuObject(nsMenuContainer *aParent, nsIContent *aContent); -+ nsMenuObject(nsNativeMenuDocListener *aListener, nsIContent *aContent); -+ -+ enum PropertyFlags { -+#define DBUSMENU_PROPERTY(e, s, b) eProp##e = (1 << b), -+ DBUSMENU_PROPERTIES -+#undef DBUSMENU_PROPERTY -+ }; -+ -+ void UpdateLabel(); -+ void UpdateVisibility(const mozilla::ComputedStyle *aComputedStyle); -+ void UpdateSensitivity(); -+ void UpdateIcon(const mozilla::ComputedStyle *aComputedStyle); -+ -+ already_AddRefed<const mozilla::ComputedStyle> GetComputedStyle(); -+ -+private: -+ friend class nsMenuObjectIconLoader; -+ -+ // Set up initial properties on the native data, connect to signals etc. -+ // This should be implemented by subclasses -+ virtual void InitializeNativeData(); -+ -+ // Return the properties that this menu object type supports -+ // This should be implemented by subclasses -+ virtual PropertyFlags SupportedProperties() const; -+ -+ // Determine whether this menu object could use the specified -+ // native item. Returns true by default but can be overridden by subclasses -+ virtual bool -+ IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const; -+ -+ // Update attributes on this objects content node when the container opens. -+ // This is called before style resolution, and should be implemented by -+ // subclasses who want to modify attributes that might affect style. -+ // This will not be called when there are script blockers -+ virtual void UpdateContentAttributes(); -+ -+ // Update properties that should be refreshed when the container opens. -+ // This should be implemented by subclasses that have properties which -+ // need refreshing -+ virtual void Update(const mozilla::ComputedStyle *aComputedStyle); -+ -+ bool ShouldShowIcon() const; -+ void ClearIcon(); -+ -+ nsCOMPtr<nsIContent> mContent; -+ // mListener is a strong ref for simplicity - someone in the tree needs to -+ // own it, and this only really needs to be the top-level object (as no -+ // children outlives their parent). However, we need to keep it alive until -+ // after running the nsMenuObject destructor for the top-level menu object, -+ // hence the strong ref -+ RefPtr<nsNativeMenuDocListener> mListener; -+ nsMenuContainer *mParent; // [weak] -+ DbusmenuMenuitem *mNativeData; // [strong] -+ RefPtr<nsMenuObjectIconLoader> mIconLoader; -+}; -+ -+// Keep a weak pointer to a menu object -+class nsWeakMenuObject -+{ -+public: -+ nsWeakMenuObject() : mPrev(nullptr), mMenuObject(nullptr) {} -+ -+ nsWeakMenuObject(nsMenuObject *aMenuObject) : -+ mPrev(nullptr), mMenuObject(aMenuObject) -+ { -+ AddWeakReference(this); -+ } -+ -+ ~nsWeakMenuObject() { RemoveWeakReference(this); } -+ -+ nsMenuObject* get() const { return mMenuObject; } -+ -+ nsMenuObject* operator->() const { return mMenuObject; } -+ -+ explicit operator bool() const { return !!mMenuObject; } -+ -+ static void NotifyDestroyed(nsMenuObject *aMenuObject); -+ -+private: -+ static void AddWeakReference(nsWeakMenuObject *aWeak); -+ static void RemoveWeakReference(nsWeakMenuObject *aWeak); -+ -+ nsWeakMenuObject *mPrev; -+ static nsWeakMenuObject *sHead; -+ -+ nsMenuObject *mMenuObject; -+}; -+ -+#endif /* __nsMenuObject_h__ */ ---- /dev/null -+++ b/widget/gtk/nsMenuSeparator.cpp -@@ -0,0 +1,82 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "mozilla/Assertions.h" -+#include "nsCRT.h" -+#include "nsGkAtoms.h" -+ -+#include "nsDbusmenu.h" -+ -+#include "nsMenuContainer.h" -+#include "nsMenuSeparator.h" -+ -+using namespace mozilla; -+ -+void -+nsMenuSeparator::InitializeNativeData() -+{ -+ dbusmenu_menuitem_property_set(GetNativeData(), -+ DBUSMENU_MENUITEM_PROP_TYPE, -+ "separator"); -+} -+ -+void -+nsMenuSeparator::Update(const ComputedStyle *aComputedStyle) -+{ -+ UpdateVisibility(aComputedStyle); -+} -+ -+bool -+nsMenuSeparator::IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const -+{ -+ return nsCRT::strcmp(dbusmenu_menuitem_property_get(aNativeData, -+ DBUSMENU_MENUITEM_PROP_TYPE), -+ "separator") == 0; -+} -+ -+nsMenuObject::PropertyFlags -+nsMenuSeparator::SupportedProperties() const -+{ -+ return static_cast<nsMenuObject::PropertyFlags>( -+ nsMenuObject::ePropVisible | -+ nsMenuObject::ePropType -+ ); -+} -+ -+void -+nsMenuSeparator::OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) -+{ -+ MOZ_ASSERT(aContent == ContentNode(), "Received an event that wasn't meant for us!"); -+ -+ if (!Parent()->IsBeingDisplayed()) { -+ return; -+ } -+ -+ if (aAttribute == nsGkAtoms::hidden || -+ aAttribute == nsGkAtoms::collapsed) { -+ RefPtr<const ComputedStyle> style = GetComputedStyle(); -+ UpdateVisibility(style); -+ } -+} -+ -+nsMenuSeparator::nsMenuSeparator(nsMenuContainer *aParent, -+ nsIContent *aContent) : -+ nsMenuObject(aParent, aContent) -+{ -+ MOZ_COUNT_CTOR(nsMenuSeparator); -+} -+ -+nsMenuSeparator::~nsMenuSeparator() -+{ -+ MOZ_COUNT_DTOR(nsMenuSeparator); -+} -+ -+nsMenuObject::EType -+nsMenuSeparator::Type() const -+{ -+ return eType_MenuItem; -+} ---- /dev/null -+++ b/widget/gtk/nsMenuSeparator.h -@@ -0,0 +1,37 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsMenuSeparator_h__ -+#define __nsMenuSeparator_h__ -+ -+#include "mozilla/Attributes.h" -+ -+#include "nsMenuObject.h" -+ -+class nsIContent; -+class nsAtom; -+class nsMenuContainer; -+ -+// Menu separator class -+class nsMenuSeparator final : public nsMenuObject -+{ -+public: -+ nsMenuSeparator(nsMenuContainer *aParent, nsIContent *aContent); -+ ~nsMenuSeparator(); -+ -+ nsMenuObject::EType Type() const override; -+ -+private: -+ void InitializeNativeData() override; -+ void Update(const mozilla::ComputedStyle *aComputedStyle) override; -+ bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override; -+ nsMenuObject::PropertyFlags SupportedProperties() const override; -+ -+ void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override; -+}; -+ -+#endif /* __nsMenuSeparator_h__ */ ---- /dev/null -+++ b/widget/gtk/nsNativeMenuDocListener.cpp -@@ -0,0 +1,347 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "mozilla/Assertions.h" -+#include "mozilla/DebugOnly.h" -+#include "mozilla/dom/Document.h" -+#include "mozilla/dom/Element.h" -+#include "nsContentUtils.h" -+#include "nsAtom.h" -+#include "nsIContent.h" -+ -+#include "nsMenuContainer.h" -+ -+#include "nsNativeMenuDocListener.h" -+ -+using namespace mozilla; -+ -+uint32_t nsNativeMenuDocListener::sUpdateBlockersCount = 0; -+ -+nsNativeMenuDocListenerTArray *gPendingListeners; -+ -+/* -+ * Small helper which caches a single listener, so that consecutive -+ * events which go to the same node avoid multiple hash table lookups -+ */ -+class MOZ_STACK_CLASS DispatchHelper -+{ -+public: -+ DispatchHelper(nsNativeMenuDocListener *aListener, -+ nsIContent *aContent) : -+ mObserver(nullptr) -+ { -+ if (aContent == aListener->mLastSource) { -+ mObserver = aListener->mLastTarget; -+ } else { -+ mObserver = aListener->mContentToObserverTable.Get(aContent); -+ if (mObserver) { -+ aListener->mLastSource = aContent; -+ aListener->mLastTarget = mObserver; -+ } -+ } -+ } -+ -+ ~DispatchHelper() { }; -+ -+ nsNativeMenuChangeObserver* Observer() const { return mObserver; } -+ -+ bool HasObserver() const { return !!mObserver; } -+ -+private: -+ nsNativeMenuChangeObserver *mObserver; -+}; -+ -+NS_IMPL_ISUPPORTS(nsNativeMenuDocListener, nsIMutationObserver) -+ -+nsNativeMenuDocListener::~nsNativeMenuDocListener() -+{ -+ MOZ_ASSERT(mContentToObserverTable.Count() == 0, -+ "Some nodes forgot to unregister listeners. This is bad! (and we're lucky we made it this far)"); -+ MOZ_COUNT_DTOR(nsNativeMenuDocListener); -+} -+ -+void -+nsNativeMenuDocListener::AttributeChanged(mozilla::dom::Element *aElement, -+ int32_t aNameSpaceID, -+ nsAtom *aAttribute, -+ int32_t aModType, -+ const nsAttrValue* aOldValue) -+{ -+ if (sUpdateBlockersCount == 0) { -+ DoAttributeChanged(aElement, aAttribute); -+ return; -+ } -+ -+ MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get(); -+ m->mType = MutationRecord::eAttributeChanged; -+ m->mTarget = aElement; -+ m->mAttribute = aAttribute; -+ -+ ScheduleFlush(this); -+} -+ -+void -+nsNativeMenuDocListener::ContentAppended(nsIContent *aFirstNewContent) -+{ -+ for (nsIContent *c = aFirstNewContent; c; c = c->GetNextSibling()) { -+ ContentInserted(c); -+ } -+} -+ -+void -+nsNativeMenuDocListener::ContentInserted(nsIContent *aChild) -+{ -+ nsIContent* container = aChild->GetParent(); -+ if (!container) { -+ return; -+ } -+ -+ nsIContent *prevSibling = nsMenuContainer::GetPreviousSupportedSibling(aChild); -+ -+ if (sUpdateBlockersCount == 0) { -+ DoContentInserted(container, aChild, prevSibling); -+ return; -+ } -+ -+ MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get(); -+ m->mType = MutationRecord::eContentInserted; -+ m->mTarget = container; -+ m->mChild = aChild; -+ m->mPrevSibling = prevSibling; -+ -+ ScheduleFlush(this); -+} -+ -+void -+nsNativeMenuDocListener::ContentRemoved(nsIContent *aChild, -+ nsIContent *aPreviousSibling) -+{ -+ nsIContent* container = aChild->GetParent(); -+ if (!container) { -+ return; -+ } -+ -+ if (sUpdateBlockersCount == 0) { -+ DoContentRemoved(container, aChild); -+ return; -+ } -+ -+ MutationRecord *m = mPendingMutations.AppendElement(MakeUnique<MutationRecord>())->get(); -+ m->mType = MutationRecord::eContentRemoved; -+ m->mTarget = container; -+ m->mChild = aChild; -+ -+ ScheduleFlush(this); -+} -+ -+void -+nsNativeMenuDocListener::NodeWillBeDestroyed(nsINode *aNode) -+{ -+ mDocument = nullptr; -+} -+ -+void -+nsNativeMenuDocListener::DoAttributeChanged(nsIContent *aContent, -+ nsAtom *aAttribute) -+{ -+ DispatchHelper h(this, aContent); -+ if (h.HasObserver()) { -+ h.Observer()->OnAttributeChanged(aContent, aAttribute); -+ } -+} -+ -+void -+nsNativeMenuDocListener::DoContentInserted(nsIContent *aContainer, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling) -+{ -+ DispatchHelper h(this, aContainer); -+ if (h.HasObserver()) { -+ h.Observer()->OnContentInserted(aContainer, aChild, aPrevSibling); -+ } -+} -+ -+void -+nsNativeMenuDocListener::DoContentRemoved(nsIContent *aContainer, -+ nsIContent *aChild) -+{ -+ DispatchHelper h(this, aContainer); -+ if (h.HasObserver()) { -+ h.Observer()->OnContentRemoved(aContainer, aChild); -+ } -+} -+ -+void -+nsNativeMenuDocListener::DoBeginUpdates(nsIContent *aTarget) -+{ -+ DispatchHelper h(this, aTarget); -+ if (h.HasObserver()) { -+ h.Observer()->OnBeginUpdates(aTarget); -+ } -+} -+ -+void -+nsNativeMenuDocListener::DoEndUpdates(nsIContent *aTarget) -+{ -+ DispatchHelper h(this, aTarget); -+ if (h.HasObserver()) { -+ h.Observer()->OnEndUpdates(); -+ } -+} -+ -+void -+nsNativeMenuDocListener::FlushPendingMutations() -+{ -+ nsIContent *currentTarget = nullptr; -+ bool inUpdateSequence = false; -+ -+ while (mPendingMutations.Length() > 0) { -+ MutationRecord *m = mPendingMutations[0].get(); -+ -+ if (m->mTarget != currentTarget) { -+ if (inUpdateSequence) { -+ DoEndUpdates(currentTarget); -+ inUpdateSequence = false; -+ } -+ -+ currentTarget = m->mTarget; -+ -+ if (mPendingMutations.Length() > 1 && -+ mPendingMutations[1]->mTarget == currentTarget) { -+ DoBeginUpdates(currentTarget); -+ inUpdateSequence = true; -+ } -+ } -+ -+ switch (m->mType) { -+ case MutationRecord::eAttributeChanged: -+ DoAttributeChanged(m->mTarget, m->mAttribute); -+ break; -+ case MutationRecord::eContentInserted: -+ DoContentInserted(m->mTarget, m->mChild, m->mPrevSibling); -+ break; -+ case MutationRecord::eContentRemoved: -+ DoContentRemoved(m->mTarget, m->mChild); -+ break; -+ default: -+ MOZ_ASSERT_UNREACHABLE("Invalid type"); -+ } -+ -+ mPendingMutations.RemoveElementAt(0); -+ } -+ -+ if (inUpdateSequence) { -+ DoEndUpdates(currentTarget); -+ } -+} -+ -+/* static */ void -+nsNativeMenuDocListener::ScheduleFlush(nsNativeMenuDocListener *aListener) -+{ -+ MOZ_ASSERT(sUpdateBlockersCount > 0, "Shouldn't be doing this now"); -+ -+ if (!gPendingListeners) { -+ gPendingListeners = new nsNativeMenuDocListenerTArray; -+ } -+ -+ if (gPendingListeners->IndexOf(aListener) == -+ nsNativeMenuDocListenerTArray::NoIndex) { -+ gPendingListeners->AppendElement(aListener); -+ } -+} -+ -+/* static */ void -+nsNativeMenuDocListener::CancelFlush(nsNativeMenuDocListener *aListener) -+{ -+ if (!gPendingListeners) { -+ return; -+ } -+ -+ gPendingListeners->RemoveElement(aListener); -+} -+ -+/* static */ void -+nsNativeMenuDocListener::RemoveUpdateBlocker() -+{ -+ if (sUpdateBlockersCount == 1 && gPendingListeners) { -+ while (gPendingListeners->Length() > 0) { -+ (*gPendingListeners)[0]->FlushPendingMutations(); -+ gPendingListeners->RemoveElementAt(0); -+ } -+ } -+ -+ MOZ_ASSERT(sUpdateBlockersCount > 0, "Negative update blockers count!"); -+ sUpdateBlockersCount--; -+} -+ -+nsNativeMenuDocListener::nsNativeMenuDocListener(nsIContent *aRootNode) : -+ mRootNode(aRootNode), -+ mDocument(nullptr), -+ mLastSource(nullptr), -+ mLastTarget(nullptr) -+{ -+ MOZ_COUNT_CTOR(nsNativeMenuDocListener); -+} -+ -+void -+nsNativeMenuDocListener::RegisterForContentChanges(nsIContent *aContent, -+ nsNativeMenuChangeObserver *aObserver) -+{ -+ MOZ_ASSERT(aContent, "Need content parameter"); -+ MOZ_ASSERT(aObserver, "Need observer parameter"); -+ if (!aContent || !aObserver) { -+ return; -+ } -+ -+ DebugOnly<nsNativeMenuChangeObserver *> old; -+ MOZ_ASSERT(!mContentToObserverTable.Get(aContent, &old) || old == aObserver, -+ "Multiple observers for the same content node are not supported"); -+ -+ mContentToObserverTable.InsertOrUpdate(aContent, aObserver); -+} -+ -+void -+nsNativeMenuDocListener::UnregisterForContentChanges(nsIContent *aContent) -+{ -+ MOZ_ASSERT(aContent, "Need content parameter"); -+ if (!aContent) { -+ return; -+ } -+ -+ mContentToObserverTable.Remove(aContent); -+ if (aContent == mLastSource) { -+ mLastSource = nullptr; -+ mLastTarget = nullptr; -+ } -+} -+ -+void -+nsNativeMenuDocListener::Start() -+{ -+ if (mDocument) { -+ return; -+ } -+ -+ mDocument = mRootNode->OwnerDoc(); -+ if (!mDocument) { -+ return; -+ } -+ -+ mDocument->AddMutationObserver(this); -+} -+ -+void -+nsNativeMenuDocListener::Stop() -+{ -+ if (mDocument) { -+ mDocument->RemoveMutationObserver(this); -+ mDocument = nullptr; -+ } -+ -+ CancelFlush(this); -+ mPendingMutations.Clear(); -+} ---- /dev/null -+++ b/widget/gtk/nsNativeMenuDocListener.h -@@ -0,0 +1,152 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsNativeMenuDocListener_h__ -+#define __nsNativeMenuDocListener_h__ -+ -+#include "mozilla/Attributes.h" -+#include "mozilla/RefPtr.h" -+#include "mozilla/UniquePtr.h" -+#include "nsTHashMap.h" -+#include "nsStubMutationObserver.h" -+#include "nsTArray.h" -+ -+class nsAtom; -+class nsIContent; -+class nsNativeMenuChangeObserver; -+ -+namespace mozilla { -+namespace dom { -+class Document; -+} -+} -+ -+/* -+ * This class keeps a mapping of content nodes to observers and forwards DOM -+ * mutations to these. There is exactly one of these for every menubar. -+ */ -+class nsNativeMenuDocListener final : nsStubMutationObserver -+{ -+public: -+ NS_DECL_ISUPPORTS -+ -+ nsNativeMenuDocListener(nsIContent *aRootNode); -+ -+ // Register an observer to receive mutation events for the specified -+ // content node. The caller must keep the observer alive until -+ // UnregisterForContentChanges is called. -+ void RegisterForContentChanges(nsIContent *aContent, -+ nsNativeMenuChangeObserver *aObserver); -+ -+ // Unregister the registered observer for the specified content node -+ void UnregisterForContentChanges(nsIContent *aContent); -+ -+ // Start listening to the document and forwarding DOM mutations to -+ // registered observers. -+ void Start(); -+ -+ // Stop listening to the document. No DOM mutations will be forwarded -+ // to registered observers. -+ void Stop(); -+ -+ /* -+ * This class is intended to be used inside GObject signal handlers. -+ * It allows us to queue updates until we have finished delivering -+ * events to Gecko, and then we can batch updates to our view of the -+ * menu. This allows us to do menu updates without altering the structure -+ * seen by the OS. -+ */ -+ class MOZ_STACK_CLASS BlockUpdatesScope -+ { -+ public: -+ BlockUpdatesScope() -+ { -+ nsNativeMenuDocListener::AddUpdateBlocker(); -+ } -+ -+ ~BlockUpdatesScope() -+ { -+ nsNativeMenuDocListener::RemoveUpdateBlocker(); -+ } -+ }; -+ -+private: -+ friend class DispatchHelper; -+ -+ struct MutationRecord { -+ enum RecordType { -+ eAttributeChanged, -+ eContentInserted, -+ eContentRemoved -+ } mType; -+ -+ nsCOMPtr<nsIContent> mTarget; -+ nsCOMPtr<nsIContent> mChild; -+ nsCOMPtr<nsIContent> mPrevSibling; -+ RefPtr<nsAtom> mAttribute; -+ }; -+ -+ ~nsNativeMenuDocListener(); -+ -+ NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED -+ NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED -+ NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED -+ NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED -+ NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED -+ -+ void DoAttributeChanged(nsIContent *aContent, nsAtom *aAttribute); -+ void DoContentInserted(nsIContent *aContainer, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling); -+ void DoContentRemoved(nsIContent *aContainer, nsIContent *aChild); -+ void DoBeginUpdates(nsIContent *aTarget); -+ void DoEndUpdates(nsIContent *aTarget); -+ -+ void FlushPendingMutations(); -+ static void ScheduleFlush(nsNativeMenuDocListener *aListener); -+ static void CancelFlush(nsNativeMenuDocListener *aListener); -+ -+ static void AddUpdateBlocker() { ++sUpdateBlockersCount; } -+ static void RemoveUpdateBlocker(); -+ -+ nsCOMPtr<nsIContent> mRootNode; -+ mozilla::dom::Document *mDocument; -+ nsIContent *mLastSource; -+ nsNativeMenuChangeObserver *mLastTarget; -+ nsTArray<mozilla::UniquePtr<MutationRecord> > mPendingMutations; -+ nsTHashMap<nsPtrHashKey<nsIContent>, nsNativeMenuChangeObserver *> mContentToObserverTable; -+ -+ static uint32_t sUpdateBlockersCount; -+}; -+ -+typedef nsTArray<RefPtr<nsNativeMenuDocListener> > nsNativeMenuDocListenerTArray; -+ -+/* -+ * Implemented by classes that want to listen to mutation events from content -+ * nodes. -+ */ -+class nsNativeMenuChangeObserver -+{ -+public: -+ virtual void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) {} -+ -+ virtual void OnContentInserted(nsIContent *aContainer, -+ nsIContent *aChild, -+ nsIContent *aPrevSibling) {} -+ -+ virtual void OnContentRemoved(nsIContent *aContainer, nsIContent *aChild) {} -+ -+ // Signals the start of a sequence of more than 1 event for the specified -+ // node. This only happens when events are flushed as all BlockUpdatesScope -+ // instances go out of scope -+ virtual void OnBeginUpdates(nsIContent *aContent) {}; -+ -+ // Signals the end of a sequence of events -+ virtual void OnEndUpdates() {}; -+}; -+ -+#endif /* __nsNativeMenuDocListener_h__ */ ---- /dev/null -+++ b/widget/gtk/nsNativeMenuService.cpp -@@ -0,0 +1,478 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#include "mozilla/dom/Element.h" -+#include "mozilla/Assertions.h" -+#include "mozilla/Preferences.h" -+#include "mozilla/UniquePtr.h" -+#include "nsCOMPtr.h" -+#include "nsCRT.h" -+#include "nsGtkUtils.h" -+#include "nsIContent.h" -+#include "nsIWidget.h" -+#include "nsServiceManagerUtils.h" -+#include "nsWindow.h" -+#include "prlink.h" -+ -+#include "nsDbusmenu.h" -+#include "nsMenuBar.h" -+#include "nsNativeMenuDocListener.h" -+ -+#include <glib-object.h> -+#include <pango/pango.h> -+#include <stdlib.h> -+ -+#include "nsNativeMenuService.h" -+ -+using namespace mozilla; -+ -+nsNativeMenuService* nsNativeMenuService::sService = nullptr; -+ -+extern PangoLayout* gPangoLayout; -+extern nsNativeMenuDocListenerTArray* gPendingListeners; -+ -+#undef g_dbus_proxy_new_for_bus -+#undef g_dbus_proxy_new_for_bus_finish -+#undef g_dbus_proxy_call -+#undef g_dbus_proxy_call_finish -+#undef g_dbus_proxy_get_name_owner -+ -+typedef void (*_g_dbus_proxy_new_for_bus_fn)(GBusType, GDBusProxyFlags, -+ GDBusInterfaceInfo*, -+ const gchar*, const gchar*, -+ const gchar*, GCancellable*, -+ GAsyncReadyCallback, gpointer); -+ -+typedef GDBusProxy* (*_g_dbus_proxy_new_for_bus_finish_fn)(GAsyncResult*, -+ GError**); -+typedef void (*_g_dbus_proxy_call_fn)(GDBusProxy*, const gchar*, GVariant*, -+ GDBusCallFlags, gint, GCancellable*, -+ GAsyncReadyCallback, gpointer); -+typedef GVariant* (*_g_dbus_proxy_call_finish_fn)(GDBusProxy*, GAsyncResult*, -+ GError**); -+typedef gchar* (*_g_dbus_proxy_get_name_owner_fn)(GDBusProxy*); -+ -+static _g_dbus_proxy_new_for_bus_fn _g_dbus_proxy_new_for_bus; -+static _g_dbus_proxy_new_for_bus_finish_fn _g_dbus_proxy_new_for_bus_finish; -+static _g_dbus_proxy_call_fn _g_dbus_proxy_call; -+static _g_dbus_proxy_call_finish_fn _g_dbus_proxy_call_finish; -+static _g_dbus_proxy_get_name_owner_fn _g_dbus_proxy_get_name_owner; -+ -+#define g_dbus_proxy_new_for_bus _g_dbus_proxy_new_for_bus -+#define g_dbus_proxy_new_for_bus_finish _g_dbus_proxy_new_for_bus_finish -+#define g_dbus_proxy_call _g_dbus_proxy_call -+#define g_dbus_proxy_call_finish _g_dbus_proxy_call_finish -+#define g_dbus_proxy_get_name_owner _g_dbus_proxy_get_name_owner -+ -+static PRLibrary *gGIOLib = nullptr; -+ -+static nsresult -+GDBusInit() -+{ -+ gGIOLib = PR_LoadLibrary("libgio-2.0.so.0"); -+ if (!gGIOLib) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ g_dbus_proxy_new_for_bus = (_g_dbus_proxy_new_for_bus_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_new_for_bus"); -+ g_dbus_proxy_new_for_bus_finish = (_g_dbus_proxy_new_for_bus_finish_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_new_for_bus_finish"); -+ g_dbus_proxy_call = (_g_dbus_proxy_call_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_call"); -+ g_dbus_proxy_call_finish = (_g_dbus_proxy_call_finish_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_call_finish"); -+ g_dbus_proxy_get_name_owner = (_g_dbus_proxy_get_name_owner_fn)PR_FindFunctionSymbol(gGIOLib, "g_dbus_proxy_get_name_owner"); -+ -+ if (!g_dbus_proxy_new_for_bus || -+ !g_dbus_proxy_new_for_bus_finish || -+ !g_dbus_proxy_call || -+ !g_dbus_proxy_call_finish || -+ !g_dbus_proxy_get_name_owner) { -+ return NS_ERROR_FAILURE; -+ } -+ -+ return NS_OK; -+} -+ -+NS_IMPL_ISUPPORTS(nsNativeMenuService, nsINativeMenuService) -+ -+nsNativeMenuService::nsNativeMenuService() : -+ mCreateProxyCancellable(nullptr), mDbusProxy(nullptr), mOnline(false) -+{ -+} -+ -+nsNativeMenuService::~nsNativeMenuService() -+{ -+ SetOnline(false); -+ -+ if (mCreateProxyCancellable) { -+ g_cancellable_cancel(mCreateProxyCancellable); -+ g_object_unref(mCreateProxyCancellable); -+ mCreateProxyCancellable = nullptr; -+ } -+ -+ // Make sure we disconnect map-event handlers -+ while (mMenuBars.Length() > 0) { -+ NotifyNativeMenuBarDestroyed(mMenuBars[0]); -+ } -+ -+ Preferences::UnregisterCallback(PrefChangedCallback, -+ "ui.use_unity_menubar"); -+ -+ if (mDbusProxy) { -+ g_signal_handlers_disconnect_by_func(mDbusProxy, -+ FuncToGpointer(name_owner_changed_cb), -+ NULL); -+ g_object_unref(mDbusProxy); -+ } -+ -+ if (gPendingListeners) { -+ delete gPendingListeners; -+ gPendingListeners = nullptr; -+ } -+ if (gPangoLayout) { -+ g_object_unref(gPangoLayout); -+ gPangoLayout = nullptr; -+ } -+ -+ MOZ_ASSERT(sService == this); -+ sService = nullptr; -+} -+ -+nsresult -+nsNativeMenuService::Init() -+{ -+ nsresult rv = nsDbusmenuFunctions::Init(); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+ -+ rv = GDBusInit(); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+ -+ Preferences::RegisterCallback(PrefChangedCallback, -+ "ui.use_unity_menubar"); -+ -+ mCreateProxyCancellable = g_cancellable_new(); -+ -+ g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION, -+ static_cast<GDBusProxyFlags>( -+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS | -+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START), -+ nullptr, -+ "com.canonical.AppMenu.Registrar", -+ "/com/canonical/AppMenu/Registrar", -+ "com.canonical.AppMenu.Registrar", -+ mCreateProxyCancellable, proxy_created_cb, -+ nullptr); -+ -+ /* We don't technically know that the shell will draw the menubar until -+ * we know whether anybody owns the name of the menubar service on the -+ * session bus. However, discovering this happens asynchronously so -+ * we optimize for the common case here by assuming that the shell will -+ * draw window menubars if we are running inside Unity. This should -+ * mean that we avoid temporarily displaying the window menubar ourselves -+ */ -+ const char *desktop = getenv("XDG_CURRENT_DESKTOP"); -+ if (nsCRT::strcmp(desktop, "Unity") == 0) { -+ SetOnline(true); -+ } -+ -+ return NS_OK; -+} -+ -+/* static */ void -+nsNativeMenuService::EnsureInitialized() -+{ -+ if (sService) { -+ return; -+ } -+ nsCOMPtr<nsINativeMenuService> service = -+ do_GetService("@mozilla.org/widget/nativemenuservice;1"); -+} -+ -+void -+nsNativeMenuService::SetOnline(bool aOnline) -+{ -+ if (!Preferences::GetBool("ui.use_unity_menubar", true)) { -+ aOnline = false; -+ } -+ -+ mOnline = aOnline; -+ if (aOnline) { -+ for (uint32_t i = 0; i < mMenuBars.Length(); ++i) { -+ RegisterNativeMenuBar(mMenuBars[i]); -+ } -+ } else { -+ for (uint32_t i = 0; i < mMenuBars.Length(); ++i) { -+ mMenuBars[i]->Deactivate(); -+ } -+ } -+} -+ -+void -+nsNativeMenuService::RegisterNativeMenuBar(nsMenuBar *aMenuBar) -+{ -+ if (!mOnline) { -+ return; -+ } -+ -+ // This will effectively create the native menubar for -+ // exporting over the session bus, and hide the XUL menubar -+ aMenuBar->Activate(); -+ -+ if (!mDbusProxy || -+ !gtk_widget_get_mapped(aMenuBar->TopLevelWindow()) || -+ mMenuBarRegistrationCancellables.Get(aMenuBar, nullptr)) { -+ // Don't go further if we don't have a proxy for the shell menu -+ // service, the window isn't mapped or there is a request in progress. -+ return; -+ } -+ -+ uint32_t xid = aMenuBar->WindowId(); -+ nsCString path = aMenuBar->ObjectPath(); -+ if (xid == 0 || path.IsEmpty()) { -+ NS_WARNING("Menubar has invalid XID or object path"); -+ return; -+ } -+ -+ GCancellable *cancellable = g_cancellable_new(); -+ mMenuBarRegistrationCancellables.InsertOrUpdate(aMenuBar, cancellable); -+ -+ // We keep a weak ref because we can't assume that GDBus cancellation -+ // is reliable (see https://launchpad.net/bugs/953562) -+ -+ g_dbus_proxy_call(mDbusProxy, "RegisterWindow", -+ g_variant_new("(uo)", xid, path.get()), -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ cancellable, -+ register_native_menubar_cb, aMenuBar); -+} -+ -+/* static */ void -+nsNativeMenuService::name_owner_changed_cb(GObject *gobject, -+ GParamSpec *pspec, -+ gpointer user_data) -+{ -+ nsNativeMenuService::GetSingleton()->OnNameOwnerChanged(); -+} -+ -+/* static */ void -+nsNativeMenuService::proxy_created_cb(GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ GError *error = nullptr; -+ GDBusProxy *proxy = g_dbus_proxy_new_for_bus_finish(res, &error); -+ if (error && g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { -+ g_error_free(error); -+ return; -+ } -+ -+ if (error) { -+ g_error_free(error); -+ } -+ -+ // We need this check because we can't assume that GDBus cancellation -+ // is reliable (see https://launchpad.net/bugs/953562) -+ nsNativeMenuService *self = nsNativeMenuService::GetSingleton(); -+ if (!self) { -+ if (proxy) { -+ g_object_unref(proxy); -+ } -+ return; -+ } -+ -+ self->OnProxyCreated(proxy); -+} -+ -+/* static */ void -+nsNativeMenuService::register_native_menubar_cb(GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ nsMenuBar *menuBar = static_cast<nsMenuBar *>(user_data); -+ -+ GError *error = nullptr; -+ GVariant *results = g_dbus_proxy_call_finish(G_DBUS_PROXY(source_object), -+ res, &error); -+ if (results) { -+ // There's nothing useful in the response -+ g_variant_unref(results); -+ } -+ -+ bool success = error ? false : true; -+ if (error && g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { -+ g_error_free(error); -+ return; -+ } -+ -+ if (error) { -+ g_error_free(error); -+ } -+ -+ nsNativeMenuService *self = nsNativeMenuService::GetSingleton(); -+ if (!self) { -+ return; -+ } -+ -+ self->OnNativeMenuBarRegistered(menuBar, success); -+} -+ -+/* static */ gboolean -+nsNativeMenuService::map_event_cb(GtkWidget *widget, -+ GdkEvent *event, -+ gpointer user_data) -+{ -+ nsMenuBar *menubar = static_cast<nsMenuBar *>(user_data); -+ nsNativeMenuService::GetSingleton()->RegisterNativeMenuBar(menubar); -+ -+ return FALSE; -+} -+ -+void -+nsNativeMenuService::OnNameOwnerChanged() -+{ -+ char *owner = g_dbus_proxy_get_name_owner(mDbusProxy); -+ SetOnline(owner ? true : false); -+ g_free(owner); -+} -+ -+void -+nsNativeMenuService::OnProxyCreated(GDBusProxy *aProxy) -+{ -+ mDbusProxy = aProxy; -+ -+ g_object_unref(mCreateProxyCancellable); -+ mCreateProxyCancellable = nullptr; -+ -+ if (!mDbusProxy) { -+ SetOnline(false); -+ return; -+ } -+ -+ g_signal_connect(mDbusProxy, "notify::g-name-owner", -+ G_CALLBACK(name_owner_changed_cb), nullptr); -+ -+ OnNameOwnerChanged(); -+} -+ -+void -+nsNativeMenuService::OnNativeMenuBarRegistered(nsMenuBar *aMenuBar, -+ bool aSuccess) -+{ -+ // Don't assume that GDBus cancellation is reliable (ie, |aMenuBar| might -+ // have already been deleted (see https://launchpad.net/bugs/953562) -+ GCancellable *cancellable = nullptr; -+ if (!mMenuBarRegistrationCancellables.Get(aMenuBar, &cancellable)) { -+ return; -+ } -+ -+ g_object_unref(cancellable); -+ mMenuBarRegistrationCancellables.Remove(aMenuBar); -+ -+ if (!aSuccess) { -+ aMenuBar->Deactivate(); -+ } -+} -+ -+/* static */ void -+nsNativeMenuService::PrefChangedCallback(const char *aPref, -+ void *aClosure) -+{ -+ nsNativeMenuService::GetSingleton()->PrefChanged(); -+} -+ -+void -+nsNativeMenuService::PrefChanged() -+{ -+ if (!mDbusProxy) { -+ SetOnline(false); -+ return; -+ } -+ -+ OnNameOwnerChanged(); -+} -+ -+NS_IMETHODIMP -+nsNativeMenuService::CreateNativeMenuBar(nsIWidget *aParent, -+ mozilla::dom::Element *aMenuBarNode) -+{ -+ NS_ENSURE_ARG(aParent); -+ NS_ENSURE_ARG(aMenuBarNode); -+ -+ if (aMenuBarNode->AttrValueIs(kNameSpaceID_None, -+ nsGkAtoms::_moz_menubarkeeplocal, -+ nsGkAtoms::_true, -+ eCaseMatters)) { -+ return NS_OK; -+ } -+ -+ UniquePtr<nsMenuBar> menubar(nsMenuBar::Create(aParent, aMenuBarNode)); -+ if (!menubar) { -+ NS_WARNING("Failed to create menubar"); -+ return NS_ERROR_FAILURE; -+ } -+ -+ // Unity forgets our window if it is unmapped by the application, which -+ // happens with some extensions that add "minimize to tray" type -+ // functionality. We hook on to the MapNotify event to re-register our menu -+ // with Unity -+ g_signal_connect(G_OBJECT(menubar->TopLevelWindow()), -+ "map-event", G_CALLBACK(map_event_cb), -+ menubar.get()); -+ -+ mMenuBars.AppendElement(menubar.get()); -+ RegisterNativeMenuBar(menubar.get()); -+ -+ static_cast<nsWindow *>(aParent)->SetMenuBar(std::move(menubar)); -+ -+ return NS_OK; -+} -+ -+/* static */ already_AddRefed<nsNativeMenuService> -+nsNativeMenuService::GetInstanceForServiceManager() -+{ -+ RefPtr<nsNativeMenuService> service(sService); -+ -+ if (service) { -+ return service.forget(); -+ } -+ -+ service = new nsNativeMenuService(); -+ -+ if (NS_FAILED(service->Init())) { -+ return nullptr; -+ } -+ -+ sService = service.get(); -+ return service.forget(); -+} -+ -+/* static */ nsNativeMenuService* -+nsNativeMenuService::GetSingleton() -+{ -+ EnsureInitialized(); -+ return sService; -+} -+ -+void -+nsNativeMenuService::NotifyNativeMenuBarDestroyed(nsMenuBar *aMenuBar) -+{ -+ g_signal_handlers_disconnect_by_func(aMenuBar->TopLevelWindow(), -+ FuncToGpointer(map_event_cb), -+ aMenuBar); -+ -+ mMenuBars.RemoveElement(aMenuBar); -+ -+ GCancellable *cancellable = nullptr; -+ if (mMenuBarRegistrationCancellables.Get(aMenuBar, &cancellable)) { -+ mMenuBarRegistrationCancellables.Remove(aMenuBar); -+ g_cancellable_cancel(cancellable); -+ g_object_unref(cancellable); -+ } -+} ---- /dev/null -+++ b/widget/gtk/nsNativeMenuService.h -@@ -0,0 +1,85 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* vim:expandtab:shiftwidth=4:tabstop=4: -+ */ -+/* 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/. */ -+ -+#ifndef __nsNativeMenuService_h__ -+#define __nsNativeMenuService_h__ -+ -+#include "mozilla/Attributes.h" -+#include "nsCOMPtr.h" -+#include "nsTHashMap.h" -+#include "nsINativeMenuService.h" -+#include "nsTArray.h" -+ -+#include <gdk/gdk.h> -+#include <gio/gio.h> -+#include <gtk/gtk.h> -+ -+class nsMenuBar; -+ -+/* -+ * The main native menu service singleton. -+ * NativeMenuSupport::CreateNativeMenuBar calls in to this when a new top level -+ * window is created. -+ * -+ * Menubars are owned by their nsWindow. This service holds a weak reference to -+ * each menubar for the purpose of re-registering them with the shell if it -+ * needs to. The menubar is responsible for notifying the service when the last -+ * reference to it is dropped. -+ */ -+class nsNativeMenuService final : public nsINativeMenuService -+{ -+public: -+ NS_DECL_ISUPPORTS -+ -+ NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent, mozilla::dom::Element* aMenuBarNode) override; -+ -+ // Returns the singleton addref'd for the service manager -+ static already_AddRefed<nsNativeMenuService> GetInstanceForServiceManager(); -+ -+ // Returns the singleton without increasing the reference count -+ static nsNativeMenuService* GetSingleton(); -+ -+ // Called by a menubar when it is deleted -+ void NotifyNativeMenuBarDestroyed(nsMenuBar *aMenuBar); -+ -+private: -+ nsNativeMenuService(); -+ ~nsNativeMenuService(); -+ nsresult Init(); -+ -+ static void EnsureInitialized(); -+ void SetOnline(bool aOnline); -+ void RegisterNativeMenuBar(nsMenuBar *aMenuBar); -+ static void name_owner_changed_cb(GObject *gobject, -+ GParamSpec *pspec, -+ gpointer user_data); -+ static void proxy_created_cb(GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data); -+ static void register_native_menubar_cb(GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data); -+ static gboolean map_event_cb(GtkWidget *widget, GdkEvent *event, -+ gpointer user_data); -+ void OnNameOwnerChanged(); -+ void OnProxyCreated(GDBusProxy *aProxy); -+ void OnNativeMenuBarRegistered(nsMenuBar *aMenuBar, -+ bool aSuccess); -+ static void PrefChangedCallback(const char *aPref, void *aClosure); -+ void PrefChanged(); -+ -+ GCancellable *mCreateProxyCancellable; -+ GDBusProxy *mDbusProxy; -+ bool mOnline; -+ nsTArray<nsMenuBar *> mMenuBars; -+ nsTHashMap<nsPtrHashKey<nsMenuBar>, GCancellable*> mMenuBarRegistrationCancellables; -+ -+ static bool sShutdown; -+ static nsNativeMenuService *sService; -+}; -+ -+#endif /* __nsNativeMenuService_h__ */ ---- a/widget/gtk/nsWindow.cpp -+++ b/widget/gtk/nsWindow.cpp -@@ -7060,6 +7060,10 @@ void nsWindow::HideWindowChrome(bool aSh - SetWindowDecoration(aShouldHide ? BorderStyle::None : mBorderStyle); - } - -+void nsWindow::SetMenuBar(UniquePtr<nsMenuBar> aMenuBar) { -+ mMenuBar = std::move(aMenuBar); -+} -+ - bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, - bool aAlwaysRollup) { - LOG("nsWindow::CheckForRollup() aAlwaysRollup %d", aAlwaysRollup); ---- a/widget/gtk/nsWindow.h -+++ b/widget/gtk/nsWindow.h -@@ -26,6 +26,8 @@ - #include "nsRefPtrHashtable.h" - #include "IMContextWrapper.h" - -+#include "nsMenuBar.h" -+ - #ifdef ACCESSIBILITY - # include "mozilla/a11y/LocalAccessible.h" - #endif -@@ -172,6 +174,8 @@ class nsWindow final : public nsBaseWidg - nsresult MakeFullScreen(bool aFullScreen) override; - void HideWindowChrome(bool aShouldHide) override; - -+ void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar); -+ - /** - * GetLastUserInputTime returns a timestamp for the most recent user input - * event. This is intended for pointer grab requests (including drags). -@@ -824,6 +828,8 @@ class nsWindow final : public nsBaseWidg - - static bool sTransparentMainWindow; - -+ mozilla::UniquePtr<nsMenuBar> mMenuBar; -+ - #ifdef ACCESSIBILITY - RefPtr<mozilla::a11y::LocalAccessible> mRootAccessible; - ---- /dev/null -+++ b/xpcom/ds/NativeMenuAtoms.py -@@ -0,0 +1,9 @@ -+from Atom import Atom -+ -+NATIVE_MENU_ATOMS = [ -+ Atom("menuitem_with_favicon", "menuitem-with-favicon"), -+ Atom("_moz_menubarkeeplocal", "_moz-menubarkeeplocal"), -+ Atom("_moz_nativemenupopupstate", "_moz-nativemenupopupstate"), -+ Atom("openedwithkey", "openedwithkey"), -+ Atom("shellshowingmenubar", "shellshowingmenubar"), -+] ---- a/xpcom/ds/StaticAtoms.py -+++ b/xpcom/ds/StaticAtoms.py -@@ -7,6 +7,7 @@ - PseudoElementAtom, - ) - from HTMLAtoms import HTML_PARSER_ATOMS -+from NativeMenuAtoms import NATIVE_MENU_ATOMS - - # Static atom definitions, used to generate nsGkAtomList.h. - # -@@ -2529,7 +2530,7 @@ STATIC_ATOMS = [ - InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), - InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), - # END ATOMS --] + HTML_PARSER_ATOMS -+] + HTML_PARSER_ATOMS + NATIVE_MENU_ATOMS - # fmt: on - - ---- a/widget/gtk/components.conf -+++ b/widget/gtk/components.conf -@@ -76,6 +76,14 @@ Classes = [ - 'headers': ['/widget/gtk/nsUserIdleServiceGTK.h'], - 'constructor': 'nsUserIdleServiceGTK::GetInstance', - }, -+ { -+ 'cid': '{0b3fe5aa-bc72-4303-85ae-76365df1251d}', -+ 'contract_ids': ['@mozilla.org/widget/nativemenuservice;1'], -+ 'singleton': True, -+ 'type': 'nsNativeMenuService', -+ 'constructor': 'nsNativeMenuService::GetInstanceForServiceManager', -+ 'headers': ['/widget/gtk/nsNativeMenuService.h'], -+ }, - ] - - if defined('NS_PRINTING'): ---- a/xpfe/appshell/AppWindow.cpp -+++ b/xpfe/appshell/AppWindow.cpp -@@ -80,7 +80,7 @@ - - #include "mozilla/dom/DocumentL10n.h" - --#ifdef XP_MACOSX -+#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK) - # include "mozilla/widget/NativeMenuSupport.h" - # define USE_NATIVE_MENUS - #endif ---- a/widget/gtk/NativeMenuSupport.cpp -+++ b/widget/gtk/NativeMenuSupport.cpp -@@ -7,6 +7,8 @@ - - #include "MainThreadUtils.h" - #include "NativeMenuGtk.h" -+#include "nsINativeMenuService.h" -+#include "nsServiceManagerUtils.h" - - namespace mozilla::widget { - -@@ -14,7 +16,14 @@ void NativeMenuSupport::CreateNativeMenu - dom::Element* aMenuBarElement) { - MOZ_RELEASE_ASSERT(NS_IsMainThread(), - "Attempting to create native menu bar on wrong thread!"); -- // TODO -+ -+ nsCOMPtr<nsINativeMenuService> nms = -+ do_GetService("@mozilla.org/widget/nativemenuservice;1"); -+ if (!nms) { -+ return; -+ } -+ -+ nms->CreateNativeMenuBar(aParent, aMenuBarElement); - } - - already_AddRefed<NativeMenu> NativeMenuSupport::CreateNativeContextMenu( ---- /dev/null -+++ b/widget/gtk/NativeMenuSupport.h -@@ -0,0 +1,31 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* 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/. */ -+ -+#ifndef mozilla_widget_NativeMenuSupport_h -+#define mozilla_widget_NativeMenuSupport_h -+ -+class nsIWidget; -+ -+namespace mozilla { -+ -+namespace dom { -+class Element; -+} -+ -+namespace widget { -+ -+class NativeMenuSupport final { -+public: -+ // Given a top-level window widget and a menu bar DOM node, sets up native -+ // menus. Once created, native menus are controlled via the DOM, including -+ // destruction. -+ static void CreateNativeMenuBar(nsIWidget* aParent, -+ dom::Element* aMenuBarElement); -+}; -+ -+} // namespace widget -+} // namespace mozilla -+ -+#endif // mozilla_widget_NativeMenuSupport_h ---- a/widget/moz.build -+++ b/widget/moz.build -@@ -157,6 +157,11 @@ EXPORTS += [ - "PuppetWidget.h", - ] - -+if toolkit == "gtk": -+ EXPORTS += [ -+ "nsINativeMenuService.h", -+ ] -+ - EXPORTS.mozilla += [ - "BasicEvents.h", - "ColorScheme.h", ---- /dev/null -+++ b/widget/nsINativeMenuService.h -@@ -0,0 +1,39 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* 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/. */ -+ -+#ifndef nsINativeMenuService_h_ -+#define nsINativeMenuService_h_ -+ -+#include "nsISupports.h" -+ -+class nsIWidget; -+class nsIContent; -+namespace mozilla { -+namespace dom { -+class Element; -+} -+} // namespace mozilla -+ -+// {90DF88F9-F084-4EF3-829A-49496E636DED} -+#define NS_INATIVEMENUSERVICE_IID \ -+ { \ -+ 0x90DF88F9, 0xF084, 0x4EF3, { \ -+ 0x82, 0x9A, 0x49, 0x49, 0x6E, 0x63, 0x6D, 0xED \ -+ } \ -+ } -+ -+class nsINativeMenuService : public nsISupports { -+ public: -+ NS_DECLARE_STATIC_IID_ACCESSOR(NS_INATIVEMENUSERVICE_IID) -+ // Given a top-level window widget and a menu bar DOM node, sets up native -+ // menus. Once created, native menus are controlled via the DOM, including -+ // destruction. -+ NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent, -+ mozilla::dom::Element* aMenuBarNode) = 0; -+}; -+ -+NS_DEFINE_STATIC_IID_ACCESSOR(nsINativeMenuService, NS_INATIVEMENUSERVICE_IID) -+ -+#endif // nsINativeMenuService_h_ ---- a/widget/nsWidgetsCID.h -+++ b/widget/nsWidgetsCID.h -@@ -66,6 +66,14 @@ - // Menus - //----------------------------------------------------------- - -+// {0B3FE5AA-BC72-4303-85AE-76365DF1251D} -+#define NS_NATIVEMENUSERVICE_CID \ -+ { \ -+ 0x0B3FE5AA, 0xBC72, 0x4303, { \ -+ 0x85, 0xAE, 0x76, 0x36, 0x5D, 0xF1, 0x25, 0x1D \ -+ } \ -+ } -+ - // {F6CD4F21-53AF-11d2-8DC4-00609703C14E} - #define NS_POPUPMENU_CID \ - { \ |