Upgrade to m137.4

.clang-format

@@ -9,7 +9,7 @@ Language: ObjC
 BasedOnStyle: Google
 BinPackParameters: false
 BinPackArguments: false
-ColumnLimit: 100
+ColumnLimit: 80
 ObjCBlockIndentWidth: 2
 AllowAllParametersOfDeclarationOnNextLine: true
 AlignOperands: false

.gitignore

@@ -25,6 +25,7 @@
 *_proto.xml
 *_proto_cpp.xml
 *~
+\#*#
 .*.sw?
 .cache
 .cipd

.gn

@@ -27,20 +27,19 @@ secondary_source = "//build/secondary/"
 no_check_targets = [
   "//third_party/icu/*",
 
-  # TODO(crbug.com/1151236) Remove once fixed.
-  "//base/allocator/partition_allocator:partition_alloc",
-
   # TODO: crbug/326607005 - GTEST_HAS_ABSL is broken
   "//third_party/googletest:gmock",
   "//third_party/googletest:gtest",
 ]
 
-# These are the list of GN files that run exec_script. This whitelist exists
+# These are the list of GN files that run exec_script. This allowlist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged except for gypi_to_gn calls.
-exec_script_whitelist = build_dotfile_settings.exec_script_whitelist +
+exec_script_allowlist = build_dotfile_settings.exec_script_allowlist +
                         [ "//build_overrides/build.gni" ]
 
+export_compile_commands = [ "*" ]
+
 default_args = {
   # Webrtc does not support component builds because we are not using the
   # template "component" but we rely directly on "rtc_static_library" and
@@ -53,7 +52,7 @@ default_args = {
 
   mac_sdk_min = "10.12"
 
-  ios_deployment_target = "12.0"
+  ios_deployment_target = "14.0"
 
   # The SDK API level, in contrast, is set by build/android/AndroidManifest.xml.
   android32_ndk_api_level = 21
@@ -78,4 +77,17 @@ default_args = {
   # Chromium fix resolves the problem.
   fuchsia_sdk_readelf_exec =
       "//third_party/llvm-build/Release+Asserts/bin/llvm-readelf"
+
+  # WebRTC doesn't use jni_zero's multiplexing. Since this causes an error
+  # let's temporarily disable it.
+  enable_jni_multiplexing = false
+
+  # TODO(b/42223878): use_fuzztest_wrapper adds a dependency to //base so
+  # let's temporarly disable it.
+  use_fuzztest_wrapper = false
+
+  # Enable Rust in WebRTC
+  enable_rust = true
+  enable_rust_cxx = true
+  enable_chromium_prelude = true
 }

.rustfmt.toml

@@ -0,0 +1,26 @@
+# This file defines the Rust style for automatic reformatting.
+# See also https://rust-lang.github.io/rustfmt
+
+# Rust language edition to be used by the parser.
+edition = "2021"
+
+# Version of the formatting rules to use.
+style_edition = "2021"
+
+# Line endings will be converted to \n.
+newline_style = "Unix"
+
+wrap_comments = true
+
+# The "Default" setting has a heuristic which splits lines too aggresively.
+# We are willing to revisit this setting in future versions of rustfmt.
+# Bugs:
+# * https://github.com/rust-lang/rustfmt/issues/3119
+# * https://github.com/rust-lang/rustfmt/issues/3120
+use_small_heuristics = "Max"
+
+# Third party code is formatted upstream.
+ignore = [
+  "third_party/rust/**/crate",
+  "third_party/rust/chromium_crates_io/vendor",
+]

.vpython3

@@ -80,7 +80,7 @@ wheel: <
 >
 wheel: <
   name: "infra/python/wheels/protobuf-py3"
-  version: "version:4.25.1"
+  version: "version:6.30.2"
 >
 wheel: <
   name: "infra/python/wheels/requests-py3"

AUTHORS

@@ -17,10 +17,14 @@ Akshay Shah <[email protected]>
 Alexander Brauckmann <[email protected]>
 Alexandre Gouaillard <[email protected]>
 Alex Henrie <[email protected]>
+Andrei Volykhin <[email protected]>
 Andrew MacDonald <[email protected]>
 Andrey Efremov <[email protected]>
 Andrew Johnson <[email protected]>
+Andy Tamilo <[email protected]>
 Anil Kumar <[email protected]>
+Anna Lemehova <[email protected]>
+Anton Barkov <[email protected]>
 Ben Strong <[email protected]>
 Berthold Herrmann <[email protected]>
 Bob Withers <[email protected]>
@@ -41,6 +45,7 @@ Dave Cowart <[email protected]>
 David Porter <[email protected]>
 David Sanders <[email protected]>
 Dax Booysen <[email protected]>
+Denis Genestier <[email protected]>
 Dennis Angelo <[email protected]>
 Dharmesh Chauhan <[email protected]>
 Di Wu <[email protected]>
@@ -50,11 +55,16 @@ Eike Rathke <[email protected]>
 Eric Rescorla, RTFM Inc. <[email protected]>
 Filip Hlasek <[email protected]>
 Frederik Riedel, Frogg GmbH <[email protected]>
+Gao Chun <[email protected]>
 Giji Gangadharan <[email protected]>
 Graham Yoakum <[email protected]>
+Guillaume Petit <[email protected]>
 Gustavo Garcia <[email protected]>
 Hans Knoechel <[email protected]>
+Helmut Januschka <[email protected]>
 Hugues Ekra <[email protected]>
+Hyungjoo Na <[email protected]>
+Ilya Katsnelson <[email protected]>
 Jake Hilton <[email protected]>
 James H. Brown <[email protected]>
 Jan Grulich <[email protected]>
@@ -71,14 +81,14 @@ Keiichi Enomoto <[email protected]>
 Kiran Thind <[email protected]>
 Korniltsev Anatoly <[email protected]>
 Kyutae Lee <[email protected]>
+lauren n. liberda <[email protected]>
 Lennart Grahl <[email protected]>
 Luke Weber <[email protected]>
 Maksim Khobat <[email protected]>
 Mallikarjuna Rao V <[email protected]>
 Manish Jethani <[email protected]>
 Martin Storsjo <[email protected]>
 Matthias Liebig <[email protected]>
-Maksim Sisov <[email protected]>
 Maxim Pavlov <[email protected]>
 Maxim Potapov <[email protected]>
 Michael Iedema <[email protected]>
@@ -98,13 +108,15 @@ Olivier Crête <[email protected]>
 Pali Rohar
 Paul Kapustin <[email protected]>
 Peng Yu <[email protected]>
+Pete Makeev <[email protected]>
 Philipp Hancke <[email protected]>
 Piasy Xu <[email protected]>
 Rafael Lopez Diez <[email protected]>
 Ralph Giles <[email protected]>
 Raman Budny <[email protected]>
 Ramprakash Jelari <[email protected]>
 Riku Voipio <[email protected]>
+Rishit Bansal <[email protected]>
 Robert Bares <[email protected]>
 Robert Mader <[email protected]>
 Robert Mader <[email protected]>
@@ -116,12 +128,16 @@ Satender Saroha <[email protected]>
 Saul Kravitz <[email protected]>
 Sergio Garcia Murillo <[email protected]>
 Shaofan Qi <[email protected]>
+Shigemasa Watanabe <[email protected]>
 Shuhai Peng <[email protected]>
+Shunbo Li <[email protected]>
+Shunbo Li <[email protected]>
 Seija <[email protected]>
 Silviu Caragea <[email protected]>
 Stefan Gula <[email protected]>
 Stephan Hartmann <[email protected]>
 Steve Reid <[email protected]>
+Tao chen <[email protected]>
 Takaaki Suzuki <[email protected]>
 Tarun Chawla <[email protected]>
 Todd Wong <[email protected]>
@@ -130,6 +146,7 @@ Trevor Hayes <[email protected]>
 Uladzislau Susha <[email protected]>
 Vicken Simonian <[email protected]>
 Victor Costan <[email protected]>
+Vinzenz Feenstra <[email protected]>
 Vladimir Beloborodov <[email protected]>
 Xiaohong Xu <[email protected]>
 Xiaolei Yu <[email protected]>
@@ -141,6 +158,8 @@ Yuriy Pavlyshak <[email protected]>
 Yusuke Suzuki <[email protected]>
 Pengfei Han <[email protected]>
 Yingying Ma <[email protected]>
+Hailin Zhao <[email protected]>
+Fizz Fang <[email protected]>
 # END individuals section.
 
 # BEGIN organizations section.
@@ -158,6 +177,7 @@ Google Inc. <*@google.com>
 Highfive, Inc. <*@highfive.com>
 Hopin Ltd. <*@hopin.to>
 HyperConnect Inc. <*@hpcnt.com>
+Igalia S.L. <*@igalia.com>
 Intel Corporation <*@intel.com>
 LG Electronics, Inc. <*@lge.com>
 Life On Air Inc. <*@lifeonair.com>
@@ -185,6 +205,7 @@ The WebRTC Authors <*@webrtc.org>
 Threema GmbH <*@threema.ch>
 Tuple, LLC <*@tuple.app>
 Twilio, Inc. <*@twilio.com>
+Twitch Interactive, Inc. <*@justin.tv>
 Vewd Software AS <*@vewd.com>
 Videona Socialmedia <*@videona.com>
 Videxio AS <*@videxio.com>