Merge branch 'main' into main

Author: AthulJoseph27

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': '014978fc487df70a9e4c1d6da76dd9ea26567899',
+  'skia_revision': '52155a48ff8dc7e6dcfb5171975d48cb2ac3b817',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,27 +56,27 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'b4b806ab97f299f24d946bc4c8c95ead793b85a5',
+  'dart_revision': '5e6945a72200e66b0cb7320296843aedc19449b8',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_binaryen_rev': '459bc0797f67cb2a8fd4598bb7143b34036608d9',
   'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
   'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
-  'dart_browser_launcher_rev': '0acd18820afe8751b164c7576cfe23c46e1e34c2',
-  'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
+  'dart_browser_launcher_rev': 'e5fc5d488eb5038bfec2a6690c72ab8dd353e101',
+  'dart_clock_rev': '7956d60042f4ea979c4554d43eeb57d087627869',
   'dart_collection_rev': '24b75d85df6a26aac7be13b56ff1ce4360c04a64',
-  'dart_devtools_rev': '65eb5f5c6e69817368f7560bd03ab1d05645ab20',
+  'dart_devtools_rev': 'f5e84f91b32b219d646cfb87a891cd143dc84056',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': '9adca58e4fa8e1d94924e64a184532231826496c',
-  'dart_tools_rev': '3440b74e430051304b56d4acd71b7ed30ab1855d',
-  'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
-  'dart_web_rev': 'd16c4bc3a12b27e0daf899973bcc37ef8c295cc4',
+  'dart_tools_rev': 'd4995d47b99d5e9564abfed2218f4a23df75983b',
+  'dart_watcher_rev': '3b850778ad0b62db3aa2cfe48832870c2461db30',
+  'dart_web_rev': '8478cd27d574249eca3d41f9135458dfda2762c8',
   'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
-  'dart_webkit_inspection_protocol_rev': 'e7418d7bbd98ef9c4051454dab83fd05f97bbdf9',
+  'dart_webkit_inspection_protocol_rev': 'b459c427b74bf5e0919a083a97a167fb74d8bff1',
   'dart_yaml_edit_rev': '5c54d455f272bbb83c948ac420c677371e69ae77',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -251,7 +251,7 @@ vars = {
   # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
-  'fuchsia_test_scripts_version': 'Itifj1g1iG3RWRIzMMJA1o0Ngx-UZsT6YT7kOeNCXK8C',
+  'fuchsia_test_scripts_version': 'ckCnIfKM2nOtYiVvK7ad7o3CYvC58Ps6ev4oDyMZsrEC',
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.
@@ -347,7 +347,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@459bc0797f67cb2a8fd4598bb7143b34036608d9',
 
   'src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:65eb5f5c6e69817368f7560bd03ab1d05645ab20'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:f5e84f91b32b219d646cfb87a891cd143dc84056'}]},
 
   'src/flutter/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@e623652744c82533829f2e62b1aba1a6cf06e291',
@@ -356,16 +356,16 @@ deps = {
    Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
 
   'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@02f190b88df771fc8e05c07d4b64ae942c02f456',
+   Var('dart_git') + '/bazel_worker.git@aa3cc9e826350b960e0c5a67e6065bcedba8b0ac',
 
   'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261',
+   Var('dart_git') + '/boolean_selector.git@d6c7c36ae1111f11cc24306d71d3ab2deea8fa68',
 
   'src/flutter/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@6a0bb9292ea4bb2c9e547af03da4c9948f9556a1',
+   Var('dart_git') + '/cli_util.git@c36b3941e38092d6d6f87ac27d9e88f153d3ac38',
 
   'src/flutter/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -380,7 +380,7 @@ deps = {
    Var('dart_git') + '/crypto.git@eede7d6918c51159c1422b7449f40dbac660ee57',
 
   'src/flutter/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@d486627ec2c014a1fbf653a593043c6b1e3a0eb5',
+   Var('dart_git') + '/csslib.git@a3700b05bbcc42782e8a7024790dbf019d89c249',
 
   'src/flutter/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@5d35f4d829ffb8532d345d95d3e9504ae6cd839e',
@@ -389,22 +389,22 @@ deps = {
    Var('dart_git') + '/dartdoc.git@526dbd55b5a2d8acb8af4e2d5510f6c807c9dc04',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
-   Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
+   Var('dart_git') + '/external/github.com/google/file.dart@6842feaef1c4e06239bd30f8d3ef722838b1c97e',
 
   'src/flutter/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@6c19e60366ce3d5edfaed51a7c12c98e7977977e',
+   Var('dart_git') + '/fixnum.git@83293b8ed86ccd574a94fcf4a2da43f31c1b43e0',
 
   'src/flutter/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@8b05be87f84f74d90dc0c15956f3ff95805322e5',
+   Var('dart_git') + '/glob.git@00a9c82d31c01ae88ec9ae4021d842e9b832aa52',
 
   'src/flutter/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@5516387611d848decb77ed9430904b5cd0f0b78c',
+   Var('dart_git') + '/html.git@6d3bc86cf2ab530ef3fa5f84b5980dc318a02af4',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@dfeecf0a495925456ff5d0216a559dcc422bb4a1',
+   Var('dart_git') + '/http.git@f59cd79e1322c6272481e4f2ccfa9afcb37a6525',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
+   Var('dart_git') + '/http_multi_server.git@e7515b5896b83d522189802a1e14e103e19426c0',
 
   'src/flutter/third_party/dart/third_party/pkg/http_parser':
    Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',
@@ -419,22 +419,22 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/flutter/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@8752902b75a476d2c7b64dcf01aaaee885f35c4c',
+   Var('dart_git') + '/logging.git@6fa056098ceca03d399bff64592822b2ae5dee6e',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@f6eaea38146d8901756418c4e7123eb7bd77249e',
+   Var('dart_git') + '/markdown.git@d53feae0760a4f0aae5ffdfb12d8e6acccf14b40',
 
   'src/flutter/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@d6d573d0f8d65b36550ce62aad3ce6b5e987b642',
+   Var('dart_git') + '/matcher.git@31f13583630e093731c8cf2b843c14196d748c5c',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@b66be81e38e1ac76d12ee2fe4f93757a40bbb7ba',
+   Var('dart_git') + '/mockito.git@3de67548e833a8eef66a2a49070b197c2c08b3ab',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
    Var('dart_git') + '/native.git@d144f81442894f669108699517d4f4a3f7a529f8',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@76934c2ca25922ec72909bbff7dfbddaf0d02bd9',
+   Var('dart_git') + '/package_config.git@bafff8e90be25e1985f7e3ee40ea1d22571a93e6',
 
   'src/flutter/third_party/dart/third_party/pkg/path':
    Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',
@@ -449,40 +449,40 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@d9e5ee68a350fbf4319bd4dfcb895fc016337d3a',
+   Var('dart_git') + '/pub_semver.git@8cce9d00431b6653026cdfcf6cf8548078c56f02',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@d53a8f9a98ccbe69078d397d45c2c6b3e7c243b6',
+   Var('dart_git') + '/shelf.git@f5600534e3e49ebed02e1e14ec82553958d86f36',
 
   'src/flutter/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',
+   Var('dart_git') + '/source_maps.git@17695e81d9ad129d20effd3d5c4f1cfa03f5add8',
 
   'src/flutter/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@f81cd4a2df630a97264fb4015fb93944b5b98b11',
+   Var('dart_git') + '/source_span.git@ec100b7f12e9d36d2cdb3c369fefde736de4a550',
 
   'src/flutter/third_party/dart/third_party/pkg/sse':
    Var('dart_git') + '/sse.git@af2c5c572a8da6d2f7551b80d75121f2a38a4c79',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@9476c0a0e2a33d68f9554565ef23f2324a3e3d96',
+   Var('dart_git') + '/stack_trace.git@115bcd9591d251dab7a5ad518655c2124a1cc525',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@c0c5a978b225d2e02be858e98e24455b7f79b1a0',
+   Var('dart_git') + '/stream_channel.git@f4407168b275fcde9187baefd7dbce76d0992825',
 
   'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@a40bbbd83f1176bcc0021b336f5841310f91d8cb',
+   Var('dart_git') + '/string_scanner.git@2139417ffcd0392bde3ba9bc83ee13eaa5fbed01',
 
   'src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@32ceb55e673141abff4e84b99483fe5eb881c291',
 
   'src/flutter/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
+   Var('dart_git') + '/term_glyph.git@19d8c08a4e81122639129c62049896021910c932',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@22835e2ec81169a5c05ed1ceb4fd6d0e8f4e87d6',
+   Var('dart_git') + '/test.git@8e8a83607d90a7a6813fa378b2d1962a2fc0d44b',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
+   Var('dart_git') + '/test_reflective_loader.git@598af2f503955020af0eaa82558d574a03934078',
 
   'src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -506,7 +506,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@b3d299eee5e68135c46d913d3e5b637daad27c85',
+   Var('dart_git') + '/yaml.git@e773005ab84e1b4d24132b0a687be7f9a3bfda15',
 
   'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -960,7 +960,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '8CL33jSvLCd1mPDg_tIOL40wKo7hqgKPjM30K9SgCcgC'
+        'version': 'TTSSw-kHM8_h_tdX090gNPTNfMWkcWeWuKze0IeeQNEC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

build/dart/internal/dart_test.gni

@@ -0,0 +1,40 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/build/dart/internal/gen_dartcli_call.gni")
+
+# Generates an executable that runs `dart test` on a single test program.
+#
+# Parameters:
+#   main_dart (required):
+#     The entrypoint to the Dart test program.
+#
+#   output (optional):
+#     Overrides the full output path.
+#     Defaults to $root_out_dir/gen/$target_path/$target_name; for example
+#     //flutter/foo/bar emits a binary at out/{variant}/gen/flutter/foo/bar.
+template("dart_test") {
+  assert(defined(invoker.main_dart), "Must specify 'main_dart'")
+
+  # Generate the CWD based on the directory of the invoking GN file.
+  parent_dir = get_label_info(target_name, "dir")
+  cwd = get_path_info(parent_dir, "dir")
+
+  gen_dartcli_call(target_name) {
+    args = [
+      "test",
+      invoker.main_dart,
+    ]
+    cwd = rebase_path(cwd)
+    metadata = {
+      action_type = [ "dart_test" ]
+    }
+    testonly = true
+    forward_variables_from(invoker,
+                           [
+                             "output",
+                             "visibility",
+                           ])
+  }
+}

build/dart/internal/gen_dartcli_call.gni

@@ -32,11 +32,11 @@ template("gen_dartcli_call") {
   }
 
   # Add default arguments to the Dart CLI.
+  # TODO(https://github.com/flutter/flutter/issues/156171): --suppress-analytics
   dart_args = []
   if (defined(invoker.args)) {
     dart_args += invoker.args
   }
-  dart_args += [ "--suppress-analytics" ]
 
   # Actually generate the shell script.
   gen_executable_call(target_name) {
@@ -46,6 +46,9 @@ template("gen_dartcli_call") {
                            [
                              "cwd",
                              "output",
+                             "metadata",
+                             "testonly",
+                             "visibility",
                            ])
   }
 }

build/dart/internal/gen_executable_call.gni

@@ -58,5 +58,11 @@ template("gen_executable_call") {
     script = "//flutter/build/dart/internal/gen_executable_call.py"
     outputs = [ output ]
     args = call_args
+    forward_variables_from(invoker,
+                           [
+                             "metadata",
+                             "testonly",
+                             "visibility",
+                           ])
   }
 }

build/dart/rules.gni

@@ -5,5 +5,6 @@
 # This file has rules for making Dart packages and snapshots.
 
 import("//flutter/build/dart/internal/application_snapshot.gni")
+import("//flutter/build/dart/internal/dart_test.gni")
 import("//flutter/build/dart/internal/flutter_frontend_server.gni")
 import("//flutter/build/dart/internal/flutter_snapshot.gni")

ci/builders/linux_android_aot_engine.json

@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [

ci/builders/linux_android_debug_engine.json

@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [

ci/builders/linux_android_emulator.json

@@ -46,7 +46,7 @@
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
+                            "version": "build_id:8735216702926189361"
                         }
                     ],
                     "contexts": [
@@ -78,7 +78,7 @@
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
+                            "version": "build_id:8735216702926189361"
                         }
                     ],
                     "contexts": [
@@ -139,7 +139,7 @@
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8740267484269553649"
+                            "version": "build_id:8735216702926189361"
                         }
                     ],
                     "contexts": [
@@ -156,4 +156,4 @@
             ]
         }
     ]
-}
+}

ci/builders/linux_arm_host_engine.json

@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [

ci/builders/linux_fuchsia.json

@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "drone_dimensions": [