From 3516de961df1948c464201cc8877be23d5157aba Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 10 Feb 2022 15:47:56 +0100 Subject: [PATCH] firefox: update to 97.0. --- .../firefox-96-fix-arm-linux-cross.patch | 15468 ---------------- srcpkgs/firefox/patches/sndio.patch | 6 +- srcpkgs/firefox/template | 8 +- 3 files changed, 7 insertions(+), 15475 deletions(-) delete mode 100644 srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch diff --git a/srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch b/srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch deleted file mode 100644 index f33f23516f..0000000000 --- a/srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch +++ /dev/null @@ -1,15468 +0,0 @@ ---- a/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build -+++ b/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/array_view_gn/moz.build -+++ b/third_party/libwebrtc/api/array_view_gn/moz.build -@@ -118,11 +119,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -152,6 +148,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -162,6 +165,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -+++ b/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -@@ -130,11 +132,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +161,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +182,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build -+++ b/third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build -+++ b/third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/audio/echo_control_gn/moz.build -+++ b/third_party/libwebrtc/api/audio/echo_control_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build -@@ -133,11 +133,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -166,6 +161,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -180,6 +182,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -@@ -82,8 +82,6 @@ - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True -@@ -92,7 +90,6 @@ - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "m", - "rt" - ] - -@@ -148,11 +145,6 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,8 +167,14 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "m" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -@@ -186,6 +184,13 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -208,6 +213,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ -@@ -220,4 +229,31 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ - Library("builtin_audio_decoder_factory_gn") ---- a/third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build -@@ -82,8 +82,6 @@ - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True -@@ -92,7 +90,6 @@ - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "m", - "rt" - ] - -@@ -148,11 +145,6 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,8 +167,14 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "m" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -@@ -186,6 +184,13 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -208,6 +213,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ -@@ -220,4 +229,31 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ - Library("builtin_audio_encoder_factory_gn") ---- a/third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build -@@ -14,12 +14,7 @@ - ] - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -45,12 +40,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix.cc" - ] -@@ -64,7 +53,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("audio_decoder_isac_fix_gn") ---- a/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -@@ -76,8 +76,6 @@ - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True -@@ -86,7 +84,6 @@ - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "m", - "rt" - ] - -@@ -138,11 +135,6 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,8 +157,14 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "m" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -@@ -176,6 +174,13 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -@@ -194,6 +199,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" -@@ -202,4 +211,31 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ - Library("audio_decoder_isac_gn") ---- a/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build -@@ -14,12 +14,7 @@ - ] - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -45,12 +40,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix.cc" - ] -@@ -64,7 +53,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("audio_encoder_isac_fix_gn") ---- a/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build -@@ -76,8 +76,6 @@ - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True -@@ -86,7 +84,6 @@ - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "m", - "rt" - ] - -@@ -138,11 +135,6 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,8 +157,14 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "m" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -@@ -176,6 +174,13 @@ - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -@@ -194,6 +199,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" -@@ -202,4 +211,31 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+ DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ - Library("audio_encoder_isac_gn") ---- a/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build -@@ -135,11 +135,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -168,6 +163,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -182,6 +184,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/audio_options_api_gn/moz.build -+++ b/third_party/libwebrtc/api/audio_options_api_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/bitrate_allocation_gn/moz.build -+++ b/third_party/libwebrtc/api/bitrate_allocation_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/call_api_gn/moz.build -+++ b/third_party/libwebrtc/api/call_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/callfactory_api_gn/moz.build -+++ b/third_party/libwebrtc/api/callfactory_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -+++ b/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -+++ b/third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/crypto/options_gn/moz.build -+++ b/third_party/libwebrtc/api/crypto/options_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/fec_controller_api_gn/moz.build -+++ b/third_party/libwebrtc/api/fec_controller_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -+++ b/third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -174,6 +176,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/function_view_gn/moz.build -+++ b/third_party/libwebrtc/api/function_view_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -+++ b/third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/media_stream_interface_gn/moz.build -+++ b/third_party/libwebrtc/api/media_stream_interface_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -+++ b/third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -+++ b/third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -@@ -129,11 +129,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -162,6 +157,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -172,6 +174,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build -+++ b/third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -+++ b/third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/numerics/numerics_gn/moz.build -+++ b/third_party/libwebrtc/api/numerics/numerics_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/priority_gn/moz.build -+++ b/third_party/libwebrtc/api/priority_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/refcountedbase_gn/moz.build -+++ b/third_party/libwebrtc/api/refcountedbase_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/rtc_error_gn/moz.build -+++ b/third_party/libwebrtc/api/rtc_error_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -+++ b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/rtp_headers_gn/moz.build -+++ b/third_party/libwebrtc/api/rtp_headers_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -+++ b/third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/rtp_parameters_gn/moz.build -+++ b/third_party/libwebrtc/api/rtp_parameters_gn/moz.build -@@ -127,11 +127,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -160,6 +155,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -174,6 +176,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -+++ b/third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/scoped_refptr_gn/moz.build -+++ b/third_party/libwebrtc/api/scoped_refptr_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/simulated_network_api_gn/moz.build -+++ b/third_party/libwebrtc/api/simulated_network_api_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -174,6 +176,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -+++ b/third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/transport/network_control_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/network_control_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build -+++ b/third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/transport_api_gn/moz.build -+++ b/third_party/libwebrtc/api/transport_api_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/units/data_rate_gn/moz.build -+++ b/third_party/libwebrtc/api/units/data_rate_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/units/data_size_gn/moz.build -+++ b/third_party/libwebrtc/api/units/data_size_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/units/frequency_gn/moz.build -+++ b/third_party/libwebrtc/api/units/frequency_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/units/time_delta_gn/moz.build -+++ b/third_party/libwebrtc/api/units/time_delta_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/units/timestamp_gn/moz.build -+++ b/third_party/libwebrtc/api/units/timestamp_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -+++ b/third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/encoded_image_gn/moz.build -+++ b/third_party/libwebrtc/api/video/encoded_image_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -+++ b/third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/video/video_frame_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_frame_gn/moz.build -@@ -132,11 +132,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,6 +160,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -179,6 +181,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build -@@ -133,11 +133,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -166,6 +161,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -180,6 +182,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -+++ b/third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build -+++ b/third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -+++ b/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build -+++ b/third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -+++ b/third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/audio/audio_gn/moz.build -+++ b/third_party/libwebrtc/audio/audio_gn/moz.build -@@ -152,11 +152,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -185,6 +180,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -199,6 +201,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -+++ b/third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -+++ b/third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -@@ -148,11 +148,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -181,6 +176,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -195,6 +197,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -+++ b/third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/call/bitrate_allocator_gn/moz.build -+++ b/third_party/libwebrtc/call/bitrate_allocator_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -+++ b/third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/call_gn/moz.build -+++ b/third_party/libwebrtc/call/call_gn/moz.build -@@ -143,11 +143,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -176,6 +171,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -190,6 +192,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/call_interfaces_gn/moz.build -+++ b/third_party/libwebrtc/call/call_interfaces_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/fake_network_gn/moz.build -+++ b/third_party/libwebrtc/call/fake_network_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -+++ b/third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/rtp_receiver_gn/moz.build -+++ b/third_party/libwebrtc/call/rtp_receiver_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/rtp_sender_gn/moz.build -+++ b/third_party/libwebrtc/call/rtp_sender_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/simulated_network_gn/moz.build -+++ b/third_party/libwebrtc/call/simulated_network_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build -+++ b/third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -174,6 +176,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/call/video_stream_api_gn/moz.build -+++ b/third_party/libwebrtc/call/video_stream_api_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse_arm.S", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S" -@@ -152,6 +147,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -162,6 +164,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -@@ -132,11 +132,6 @@ - "rt" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- - if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -@@ -190,11 +185,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -219,6 +209,11 @@ - - DEFINES["_DEBUG"] = True - -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -@@ -230,6 +225,13 @@ - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -256,6 +258,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ -@@ -268,4 +274,25 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ 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" -+ ] -+ - Library("common_audio_c_gn") ---- a/third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_audio/common_audio_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/common_audio_gn/moz.build -@@ -150,11 +150,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -183,6 +178,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -197,6 +199,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build -@@ -74,14 +74,12 @@ - - if CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -138,11 +136,6 @@ - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,6 +158,8 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" -+ DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["_DEBUG"] = True - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -@@ -175,4 +170,20 @@ - - DEFINES["WEBRTC_ARCH_ARM64"] = True - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" -+ DEFINES["WEBRTC_ARCH_ARM64"] = True -+ - Library("common_audio_neon_c_gn") ---- a/third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -@@ -73,14 +73,12 @@ - - if CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -137,11 +135,6 @@ - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +157,8 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" -+ DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["_DEBUG"] = True - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -@@ -174,4 +169,20 @@ - - DEFINES["WEBRTC_ARCH_ARM64"] = True - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" -+ DEFINES["WEBRTC_ARCH_ARM64"] = True -+ - Library("common_audio_neon_gn") ---- a/third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build -@@ -129,11 +129,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -162,6 +157,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -172,6 +174,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" - ] -@@ -190,6 +185,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -217,6 +219,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build -+++ b/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build -@@ -81,10 +81,6 @@ - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- - if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -@@ -126,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S" - ] -@@ -159,6 +150,10 @@ - - DEFINES["_DEBUG"] = True - -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -@@ -169,6 +164,13 @@ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -193,6 +195,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ -@@ -205,4 +211,22 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -+ ] -+ - Library("spl_sqrt_floor_gn") ---- a/third_party/libwebrtc/common_video/common_video_gn/moz.build -+++ b/third_party/libwebrtc/common_video/common_video_gn/moz.build -@@ -152,11 +152,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -185,6 +180,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -199,6 +201,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/common_video/frame_counts_gn/moz.build -+++ b/third_party/libwebrtc/common_video/frame_counts_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build -+++ b/third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -+++ b/third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -@@ -133,11 +133,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -166,6 +161,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -180,6 +182,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -+++ b/third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -+++ b/third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -+++ b/third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -@@ -142,11 +142,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,6 +170,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -189,6 +191,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -+++ b/third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -+++ b/third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_constants_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_constants_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_media_base_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_media_base_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_media_config_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_media_config_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build -+++ b/third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build -@@ -147,11 +147,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -180,6 +175,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -194,6 +196,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -178,6 +180,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -@@ -205,11 +205,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -238,6 +233,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -252,6 +254,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn/moz.build -@@ -10,12 +10,7 @@ - AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -41,12 +36,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - SOURCES += [ - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S", - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S" -@@ -61,7 +50,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("isac_fix_c_arm_asm_gn") ---- a/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn/moz.build -@@ -14,12 +14,7 @@ - AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -45,12 +40,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - SOURCES += [ - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c", - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c", -@@ -90,7 +79,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("isac_fix_c_gn") ---- a/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn/moz.build -@@ -14,12 +14,7 @@ - AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -45,12 +40,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/fft.c", - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/transform_tables.c" -@@ -65,7 +54,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("isac_fix_common_gn") ---- a/third_party/libwebrtc/modules/audio_coding/isac_fix_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_fix_gn/moz.build -@@ -14,12 +14,7 @@ - ] - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -45,12 +40,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc", - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc" -@@ -65,7 +54,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("isac_fix_gn") ---- a/third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build -@@ -14,12 +14,7 @@ - AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -45,12 +40,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "log", -- "unwind" --] -- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c", - "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c", -@@ -68,7 +57,49 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+ OS_LIBS += [ -+ "rt" -+ ] -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "log", -+ "unwind" -+ ] -+ - Library("isac_neon_gn") ---- a/third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -@@ -125,11 +125,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -158,6 +153,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -172,6 +174,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build -@@ -169,11 +169,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -202,6 +197,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -216,6 +218,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build -@@ -132,11 +132,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,6 +160,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -179,6 +181,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/red_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/red_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build -@@ -82,7 +82,6 @@ - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -139,11 +138,6 @@ - DEFINES["WEBRTC_CODEC_ISACFX"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -166,6 +160,7 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_DEBUG"] = True - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -@@ -176,6 +171,13 @@ - - DEFINES["WEBRTC_CODEC_ISAC"] = True - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -196,6 +198,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ -@@ -208,4 +214,16 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ - Library("webrtc_multiopus_gn") ---- a/third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build -@@ -82,7 +82,6 @@ - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -146,11 +145,6 @@ - DEFINES["WEBRTC_CODEC_ISACFX"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +167,7 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_DEBUG"] = True - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -@@ -183,6 +178,13 @@ - - DEFINES["WEBRTC_CODEC_ISAC"] = True - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -203,6 +205,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ -@@ -215,4 +221,16 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ - Library("webrtc_opus_gn") ---- a/third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build -@@ -81,7 +81,6 @@ - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -138,11 +137,6 @@ - DEFINES["WEBRTC_CODEC_ISACFX"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,6 +159,7 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["WEBRTC_CODEC_ISAC"] = True - DEFINES["_DEBUG"] = True - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -@@ -175,6 +170,13 @@ - - DEFINES["WEBRTC_CODEC_ISAC"] = True - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -195,6 +197,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ -@@ -207,4 +213,16 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["WEBRTC_CODEC_ISAC"] = True -+ - Library("webrtc_opus_wrapper_gn") ---- a/third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -@@ -131,11 +131,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -164,6 +159,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -174,6 +176,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build -@@ -142,11 +142,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,6 +170,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -189,6 +191,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build -@@ -129,11 +129,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -162,6 +157,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -172,6 +174,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build -@@ -129,11 +129,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -162,6 +157,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -172,6 +174,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build -@@ -191,11 +191,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -224,6 +219,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -238,6 +240,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build -@@ -143,11 +143,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - SOURCES += [ - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" - ] -@@ -180,6 +175,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -194,6 +196,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build -@@ -145,11 +145,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -178,6 +173,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -192,6 +194,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build -@@ -152,11 +152,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -185,6 +180,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -199,6 +201,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/config_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/config_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build -@@ -150,11 +150,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -183,6 +178,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -197,6 +199,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build -@@ -127,11 +127,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -160,6 +155,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -174,6 +176,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build -+++ b/third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build -@@ -145,11 +145,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -178,6 +173,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -192,6 +194,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build -+++ b/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build -+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build -@@ -224,11 +224,19 @@ - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": -+if CONFIG["CPU_ARCH"] == "arm": -+ -+ CXXFLAGS += [ -+ "-mfpu=neon" -+ ] - -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["WEBRTC_ARCH_ARM"] = True -+ DEFINES["WEBRTC_ARCH_ARM_V7"] = True -+ DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["_FORTIFY_SOURCE"] = "2" - --if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_FORTIFY_SOURCE"] = "2" - -@@ -260,4 +268,16 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ - Library("desktop_capture_generic_gn") ---- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -@@ -118,11 +118,15 @@ - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": -+if CONFIG["CPU_ARCH"] == "arm": - -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["WEBRTC_ARCH_ARM"] = True -+ DEFINES["WEBRTC_ARCH_ARM_V7"] = True -+ DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["_FORTIFY_SOURCE"] = "2" - --if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_FORTIFY_SOURCE"] = "2" - -@@ -150,4 +154,16 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ - Library("desktop_capture_gn") ---- a/third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -+++ b/third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -@@ -103,11 +103,19 @@ - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": -+if CONFIG["CPU_ARCH"] == "arm": -+ -+ CXXFLAGS += [ -+ "-mfpu=neon" -+ ] - -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["WEBRTC_ARCH_ARM"] = True -+ DEFINES["WEBRTC_ARCH_ARM_V7"] = True -+ DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["_FORTIFY_SOURCE"] = "2" - --if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_FORTIFY_SOURCE"] = "2" - -@@ -139,4 +147,16 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ - Library("primitives_gn") ---- a/third_party/libwebrtc/modules/module_api_gn/moz.build -+++ b/third_party/libwebrtc/modules/module_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/module_api_public_gn/moz.build -+++ b/third_party/libwebrtc/modules/module_api_public_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/module_fec_api_gn/moz.build -+++ b/third_party/libwebrtc/modules/module_fec_api_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build -+++ b/third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -+++ b/third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build -+++ b/third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build -@@ -150,11 +150,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -183,6 +178,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -197,6 +199,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build -+++ b/third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build -@@ -180,11 +180,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -213,6 +208,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -227,6 +229,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -+++ b/third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -@@ -192,11 +192,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -225,6 +220,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -239,6 +241,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build -+++ b/third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -+++ b/third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build -+++ b/third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build -+++ b/third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/modules/utility/utility_gn/moz.build -+++ b/third_party/libwebrtc/modules/utility/utility_gn/moz.build -@@ -142,11 +142,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,6 +170,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -189,6 +191,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build -@@ -151,11 +151,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -184,6 +179,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -194,6 +196,14 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ CXXFLAGS += [ -+ "-mfpu=neon" -+ ] -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build -@@ -143,11 +143,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -176,6 +171,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -190,6 +192,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build -@@ -138,11 +138,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -171,6 +166,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -185,6 +187,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -@@ -159,11 +159,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -192,6 +187,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -206,6 +208,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build -@@ -148,11 +148,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -181,6 +176,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -195,6 +197,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build -@@ -142,11 +142,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,6 +170,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -189,6 +191,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -@@ -143,11 +143,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -176,6 +171,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -190,6 +192,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -@@ -141,11 +141,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -174,6 +169,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -188,6 +190,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build -@@ -140,11 +140,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -173,6 +168,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -187,6 +189,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build -@@ -145,11 +145,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -178,6 +173,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -192,6 +194,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build -@@ -68,14 +68,12 @@ - - if CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - DEFINES["USE_AURA"] = "1" - DEFINES["USE_GLIB"] = "1" - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -121,11 +119,6 @@ - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -148,6 +141,8 @@ - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - -+ DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" -+ DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["_DEBUG"] = True - - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -@@ -158,4 +153,20 @@ - - DEFINES["WEBRTC_ARCH_ARM64"] = True - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" -+ DEFINES["WEBRTC_ARCH_ARM64"] = True -+ - Library("video_processing_neon_gn") ---- a/third_party/libwebrtc/moz.build -+++ b/third_party/libwebrtc/moz.build -@@ -385,10 +385,6 @@ - if CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" -@@ -481,16 +477,40 @@ - if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_gn", - "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" - ] - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DIRS += [ -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn", -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn", -+ "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -+ "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn", -+ "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn", -+ "/third_party/libwebrtc/rtc_base/system/asm_defines_gn" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" -@@ -499,8 +519,12 @@ - if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", -+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", - "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -+ "/third_party/libwebrtc/modules/audio_coding/isac_gn", - "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" ---- a/third_party/libwebrtc/rtc_base/atomicops_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/atomicops_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/checks_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/checks_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/deprecation_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/deprecation_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build -@@ -133,11 +133,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -166,6 +161,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -180,6 +182,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/logging_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/logging_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/refcount_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/refcount_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build -@@ -147,11 +147,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -180,6 +175,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -194,6 +196,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build -@@ -176,11 +176,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -209,6 +204,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -223,6 +225,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -@@ -132,11 +132,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -165,6 +160,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -179,6 +181,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build -@@ -142,11 +142,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,6 +170,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -189,6 +191,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build -@@ -10,12 +10,7 @@ - AllowCompilerWarnings() - - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" --DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -@@ -41,11 +36,6 @@ - "/tools/profiler/public" - ] - --OS_LIBS += [ -- "android_support", -- "unwind" --] -- - if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -@@ -55,7 +45,43 @@ - - if CONFIG["MOZ_DEBUG"] == "1": - -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ -+if CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ DEFINES["USE_AURA"] = "1" -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_NSS_CERTS"] = "1" -+ DEFINES["USE_OZONE"] = "1" -+ DEFINES["USE_UDEV"] = True -+ DEFINES["USE_X11"] = "1" -+ DEFINES["_FILE_OFFSET_BITS"] = "64" -+ DEFINES["_LARGEFILE64_SOURCE"] = True -+ DEFINES["_LARGEFILE_SOURCE"] = True -+ -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": -+ -+ DEFINES["ANDROID"] = True -+ DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1" -+ DEFINES["HAVE_SYS_UIO_H"] = True -+ DEFINES["WEBRTC_ANDROID"] = True -+ DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - Library("asm_defines_gn") ---- a/third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/system/inline_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/inline_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -165,6 +167,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build -@@ -137,11 +137,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -170,6 +165,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -184,6 +186,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build -@@ -122,11 +122,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -155,6 +150,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -169,6 +171,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -@@ -12,6 +12,7 @@ - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_ENABLE_VP9"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -+DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True - DEFINES["WEBRTC_LIBRARY_IMPL"] = True - DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" -@@ -50,7 +51,6 @@ - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True -@@ -63,7 +63,6 @@ - - if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -@@ -79,7 +78,6 @@ - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True - DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" -@@ -97,7 +95,6 @@ - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True -@@ -135,11 +132,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -168,6 +160,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -182,6 +181,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -@@ -114,11 +114,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -147,6 +142,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -157,6 +159,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -@@ -118,11 +118,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -151,6 +146,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -161,6 +163,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -+++ b/third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -@@ -126,11 +126,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -159,6 +154,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -173,6 +175,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -+++ b/third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -+++ b/third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -@@ -130,11 +130,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -163,6 +158,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -177,6 +179,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -+++ b/third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -@@ -151,11 +151,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -184,6 +179,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -198,6 +200,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -+++ b/third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build -@@ -94,11 +94,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -115,6 +110,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -129,6 +131,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build -@@ -94,11 +94,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -115,6 +110,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -129,6 +131,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build -@@ -94,11 +94,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -115,6 +110,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -129,6 +131,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build -@@ -96,11 +96,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -117,6 +112,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -131,6 +133,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build -@@ -109,11 +109,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -130,6 +125,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -144,6 +146,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build -@@ -94,11 +94,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -115,6 +110,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -129,6 +131,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build -@@ -94,11 +94,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -115,6 +110,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -129,6 +131,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build -+++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build -@@ -84,13 +84,6 @@ - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True -@@ -107,6 +100,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -117,6 +117,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" ---- a/third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build -+++ b/third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build -@@ -96,11 +96,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -129,6 +124,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CFLAGS += [ -@@ -143,6 +145,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ ---- a/third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build -+++ b/third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build -@@ -95,11 +95,6 @@ - "-mfpu=neon" - ] - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -128,6 +123,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -142,6 +144,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -+++ b/third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -@@ -146,11 +146,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -179,6 +174,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -193,6 +195,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -+++ b/third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -@@ -139,11 +139,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -172,6 +167,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -186,6 +188,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/video/video_gn/moz.build -+++ b/third_party/libwebrtc/video/video_gn/moz.build -@@ -168,11 +168,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -201,6 +196,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -215,6 +217,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build -+++ b/third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build -@@ -144,11 +144,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -177,6 +172,13 @@ - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - CXXFLAGS += [ -@@ -191,6 +193,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ ---- a/third_party/libwebrtc/webrtc_gn/moz.build -+++ b/third_party/libwebrtc/webrtc_gn/moz.build -@@ -84,7 +84,6 @@ - - OS_LIBS += [ - "dl", -- "m", - "rt", - "X11", - "Xcomposite", -@@ -146,11 +145,6 @@ - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -175,10 +169,21 @@ - - DEFINES["_DEBUG"] = True - -+ OS_LIBS += [ -+ "m" -+ ] -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -+ -+ OS_LIBS += [ -+ "android_support", -+ "unwind" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ -@@ -189,6 +194,10 @@ - - DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6" - -+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+ -+ DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c" -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb" -@@ -197,4 +206,22 @@ - - DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911" - -+if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ -+if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": -+ -+ OS_LIBS += [ -+ "m" -+ ] -+ - Library("webrtc_gn") diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch index 68628bea8d..fa3b6fa8ab 100644 --- a/srcpkgs/firefox/patches/sndio.patch +++ b/srcpkgs/firefox/patches/sndio.patch @@ -47,6 +47,6 @@ "--cache-file", "--datadir", + "--enable-sndio", - "--enable-crashreporter", - "--enable-dbus", - "--enable-debug-js-modules", + "--enable-official-branding", + "--includedir", + "--libdir", diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 72aff3a2fb..e62c4be75e 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=96.0.2 +version=97.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=d32d2afa9179a78e6ed97e15e0f39e372c0d662cb9614404db15e7616da31ab8 +checksum=6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28 lib32disabled=yes @@ -75,7 +75,7 @@ do_build() { case "$XBPS_TARGET_MACHINE" in *-musl) echo "ac_add_options --disable-jemalloc" >>.mozconfig - echo "ac_add_options --disable-gold" >>.mozconfig + echo "ac_add_options --enable-linker=bfd" >>.mozconfig ;; esac @@ -101,7 +101,7 @@ do_build() { # https://phabricator.services.mozilla.com/D134738 # case "$XBPS_TARGET_MACHINE" in - ppc64le*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;; + ppc64le*|armv7l*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;; esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then