merge

Author: Gray Mackall

.ci.yaml

@@ -506,6 +506,7 @@ targets:
   # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
   - name: Linux mac_clangd
     recipe: engine_v2/engine_v2
+    timeout: 90
     # Do not remove(https://github.com/flutter/flutter/issues/144644)
     # Scheduler will fail to get the platform
     drone_dimensions:

.github/workflows/engine-cp.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.merge_commit_sha }})" >> $GITHUB_ENV
       - name: Checkout Flutter Engine Repo
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
         with:
           repository: flutteractionsbot/engine
           path: engine

.github/workflows/third_party_scan.yml

@@ -21,7 +21,7 @@ jobs:
       contents: read
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
         with:
           persist-credentials: false
       - name: "setup python"
@@ -31,7 +31,7 @@ jobs:
       - name: "extract deps, find commit hash, pass to osv-scanner"
         run: python ci/scan_deps.py --output osv-lockfile-${{github.sha}}.json
       - name: "upload osv-scanner deps"
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9
         with:
           # use github.ref in name to avoid duplicated artifacts
           name: osv-lockfile-${{github.sha}}
@@ -41,7 +41,7 @@ jobs:
     name: Vulnerability scanning
     needs:
       extract-deps
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.8.4"
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.9.0"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

BUILD.gn

@@ -155,7 +155,7 @@ group("flutter") {
 
   # Build the standalone Impeller library.
   if (is_mac || is_linux || is_win || is_android) {
-    public_deps += [ "//flutter/impeller/toolkit/interop:library" ]
+    public_deps += [ "//flutter/impeller/toolkit/interop:sdk" ]
   }
 
   if ((flutter_runtime_mode == "debug" || flutter_runtime_mode == "profile") &&
@@ -196,7 +196,6 @@ group("unittests") {
       "//flutter/shell/platform/embedder:embedder_a11y_unittests",
       "//flutter/shell/platform/embedder:embedder_proctable_unittests",
       "//flutter/shell/platform/embedder:embedder_unittests",
-      "//flutter/testing:testing_unittests",
       "//flutter/testing/dart",
       "//flutter/testing/smoke_test_failure",
       "//flutter/third_party/tonic/tests:tonic_unittests",

CONTRIBUTING.md

@@ -270,7 +270,6 @@ $ ./run_tests.py --variant=host_debug_unopt_arm64 --type=engine
 | runtime_unittests                        | engine              |                                                                 |
 | shell_unittests                          | engine(not windows) |                                                                 |
 | scenario_app                             | android             | Integration and golden tests for Android, iOS                   |
-| testing_unittests                        | engine              |                                                                 |
 | tonic_unittests                          | engine              | Unit tests for //third_party/tonic                              |
 | txt_unittests                            | engine(linux)       |                                                                 |
 | ui_unittests                             | engine              |                                                                 |

DEPS

@@ -134,7 +134,6 @@ linter:
     # - one_member_abstracts # too many false positives
     - only_throw_errors # this does get disabled in a few places where we have legacy code that uses strings et al
     - overridden_fields
-    - package_api_docs
     - package_names
     - package_prefixed_library_names
     # - parameter_assignments # we do this commonly

analysis_options.yaml

@@ -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/dart_test.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_dartcli_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",
+                           ])
   }
 }