Merge branch '7204-testing'

Author: jim-signal

.gitignore

@@ -74,3 +74,4 @@
 /.vscode
 /.idea
 !webrtc/*
+rust-project.json

.gn

@@ -32,10 +32,10 @@ no_check_targets = [
   "//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 = [ "*" ]
@@ -56,8 +56,7 @@ default_args = {
   ios_deployment_target = "14.0"
 
   # The SDK API level, in contrast, is set by build/android/AndroidManifest.xml.
-  android32_ndk_api_level = 21
-  android64_ndk_api_level = 21
+  android_ndk_api_level = 21
 
   # WebRTC does not provide the gflags dependency. Because libyuv uses it only
   # for unittests, it can be disabled (see third_party/libyuv/BUILD.gn)
@@ -92,4 +91,7 @@ default_args = {
   enable_rust = true
   enable_rust_cxx = true
   enable_chromium_prelude = true
+
+  # See context on https://issues.chromium.org/issues/415076048.
+  enable_js_protobuf = false
 }

.vpython3

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

AUTHORS

@@ -89,7 +89,6 @@ 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]>
@@ -123,6 +122,7 @@ Robert Mader <[email protected]>
 Robert Mader <[email protected]>
 Robert Nagy <[email protected]>
 Ryan Yoakum <[email protected]>
+Saming Lin <[email protected]>
 Samuel Attard <[email protected]>
 Sarah Thompson <[email protected]>
 Satender Saroha <[email protected]>
@@ -178,6 +178,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>

BUILD.gn

@@ -251,6 +251,10 @@ config("common_inherited_config") {
   if (is_ubsan) {
     cflags += [ "-fsanitize=float-cast-overflow" ]
   }
+
+  if (rtc_allow_deprecated_namespaces) {
+    defines += [ "WEBRTC_ALLOW_DEPRECATED_NAMESPACES" ]
+  }
 }
 
 # TODO(bugs.webrtc.org/9693): Remove the possibility to suppress this warning
@@ -374,8 +378,7 @@ config("common_config") {
 
   if (is_clang) {
     cflags += [
-      # TODO(webrtc:13219): Fix -Wshadow instances and enable.
-      "-Wno-shadow",
+      "-Wshadow",
 
       # See https://reviews.llvm.org/D56731 for details about this
       # warning.
@@ -540,6 +543,7 @@ if (!build_with_chromium) {
       "api:libjingle_peerconnection_api",
       "api:rtc_error",
       "api:transport_api",
+      "api/audio:create_audio_device_module",
       "api/audio_codecs:opus_audio_decoder_factory",
       "api/crypto",
       "api/rtc_event_log:rtc_event_log_factory",
@@ -639,6 +643,8 @@ if (rtc_include_tests && !build_with_chromium) {
       "api:rtc_api_unittests",
       "api/audio:audio_api_unittests",
       "api/audio_codecs/test:audio_codecs_api_unittests",
+      "api/crypto:crypto_options_unittest",
+      "api/crypto:options",
       "api/numerics:numerics_unittests",
       "api/task_queue:pending_task_safety_flag_unittests",
       "api/test/metrics:metrics_unittests",
@@ -830,3 +836,14 @@ group("poison_environment_construction") {
 
 group("poison_software_video_codecs") {
 }
+
+if (!build_with_chromium) {
+  # Write debug logs to gn_logs.txt.
+  # This is also required for Siso builds.
+  import("//build/gn_logs.gni")
+  lines = [
+            "Generated during 'gn gen' by //BUILD.gn.",
+            "",
+          ] + build_gn_logs
+  write_file("$root_build_dir/gn_logs.txt", lines)
+}