Merge branch 'main' into fix/nested_same_mask_filter

Author: harryterkelsen

.ci.yaml

@@ -44,10 +44,18 @@ platform_properties:
         ]
       device_type: none
       os: Windows-10
+
 # The current android emulator config names can be found here:
 # https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto
 # You may use those names for the android_virtual_device version.
 targets:
+  - name: Linux local_engine_builds
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: local_engine
+
   - name: Linux linux_android_emulator_tests
     enabled_branches:
       - main
@@ -58,36 +66,35 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
+    timeout: 90
     runIf:
       - .ci.yaml
       - ci/builders/linux_android_emulator.json
       - DEPS
       - lib/ui/**
       - shell/platform/android/**
       - testing/scenario_app/**
+      - testing/skia_gold_client/**
 
-# Task to run Linux linux_android_emulator_tests on AVDs running Android 33
-# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947.
-  - name: Linux linux_android_emulator_tests_api_33
-    bringup: true
+  - name: Linux linux_android_emulator_skia_tests
     enabled_branches:
       - main
     recipe: engine_v2/engine_v2
     properties:
-      config_name: linux_android_emulator_api_33
+      config_name: linux_android_emulator_skia
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
+    timeout: 90
     runIf:
       - .ci.yaml
-      - ci/builders/linux_android_emulator_api_33.json
+      - ci/builders/linux_android_emulator.json
       - DEPS
       - lib/ui/**
       - shell/platform/android/**
       - testing/scenario_app/**
+      - testing/skia_gold_client/**
 
   - name: Linux builder_cache
     enabled_branches:
@@ -96,7 +103,6 @@ targets:
     presubmit: false
     properties:
       cache_name: "builder"
-      cache_root: "cache"
       cache_paths: >-
         [
           "builder",
@@ -116,7 +122,6 @@ targets:
     presubmit: false
     properties:
       cache_name: "builder"
-      cache_root: "cache"
       cache_paths: >-
         [
           "builder",
@@ -135,7 +140,6 @@ targets:
     presubmit: false
     properties:
       cache_name: "builder"
-      cache_root: "cache"
       cache_paths: >-
         [
           "builder",
@@ -161,54 +165,14 @@ targets:
       config_name: linux_benchmarks
     timeout: 60
 
-  - name: Linux Fuchsia FEMU
-    recipe: engine/femu_test
-    properties:
-      add_recipes_cq: "true"
-      build_fuchsia: "true"
-      fuchsia_ctl_version: version:0.0.27
-      # ensure files from pre-production Fuchsia SDK tests are purged from cache
-      clobber: "true"
-      emulator_arch: "x64"
-      enable_cso: "true"
-    timeout: 60
-    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
-    # runIfNot:
-    #   - lib/web_ui/**
-    #   - shell/platform/android/**
-    #   - shell/platform/darwin/**
-    #   - shell/platform/glfw/**
-    #   - shell/platform/linux/**
-    #   - shell/platform/windows/**
-    #   - web_sdk/**
-
-  - name: Linux Fuchsia arm64 FEMU
-    recipe: engine/femu_test
-    properties:
-      build_fuchsia: "true"
-      fuchsia_ctl_version: version:0.0.27
-      # ensure files from pre-production Fuchsia SDK tests are purged from cache
-      clobber: "true"
-      emulator_arch: "arm64"
-      enable_cso: "true"
-    timeout: 60
-    bringup: true
-    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
-    # runIfNot:
-    #   - lib/web_ui/**
-    #   - shell/platform/android/**
-    #   - shell/platform/darwin/**
-    #   - shell/platform/glfw/**
-    #   - shell/platform/linux/**
-    #   - shell/platform/windows/**
-    #   - web_sdk/**
-
   - name: Linux linux_fuchsia
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: linux_fuchsia
+    # Do not remove(https://github.com/flutter/flutter/issues/144644)
+    # Scheduler will fail to get the platform
     drone_dimensions:
       - os=Linux
     dimensions:
@@ -223,15 +187,6 @@ targets:
     #   - shell/platform/windows/**
     #   - web_sdk/**
 
-  - name: Linux Framework Smoke Tests
-    recipe: engine/framework_smoke
-    enabled_branches:
-      - main
-    timeout: 60
-    properties:
-      gclient_variables: >-
-        {"use_rbe": true}
-
   - name: Linux linux_clang_tidy
     recipe: engine_v2/engine_v2
     timeout: 120
@@ -320,6 +275,19 @@ targets:
       config_name: linux_web_engine
     drone_dimensions:
       - os=Linux
+    runIf:
+      - DEPS
+      - .ci.yaml
+      - lib/web_ui/**
+      - web_sdk/**
+      - tools/**
+      - ci/**
+      - flutter_frontend_server/**
+
+  - name: Linux clangd
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_unopt_debug_no_rbe
 
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
@@ -341,7 +309,6 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
-      framework: "true"
       no_goma: "true"
       drone_dimensions: >
         ["device_type=none", "os=Linux"]
@@ -407,7 +374,15 @@ targets:
     drone_dimensions:
       - os=Mac-13
 
-  - name: Linux mac_unopt
+  - name: Linux mac_clangd
+    recipe: engine_v2/engine_v2
+    # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
+    drone_dimensions:
+      - os=Linux
+    properties:
+      config_name: mac_unopt_debug_no_rbe
+
+  - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
     properties:
       config_name: mac_unopt

.clangd

@@ -0,0 +1,10 @@
+# Used to allow clangd to run on CI platforms as part of //tools/clangd_check.
+#
+# Intended to have no effect elsewhere.
+#
+# See also:
+# - https://clangd.llvm.org/config#compileflags
+# - https://github.com/clangd/clangd/issues/662
+CompileFlags:
+  Add: -Wno-unknown-warning-option
+  Remove: [-m*, -f*]

.engine-release.version

@@ -0,0 +1,8 @@
+# Used to branch and track golden-file rendering of release branches.
+#
+# See ./testing/skia_gold_client/README.md#release-testing for more information.
+
+# On the main branch, this should always read 'none'.
+# On release branches, this should be the release version such as '3.21'
+# (without the quotes).
+none

.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@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
         with:
           repository: flutteractionsbot/engine
           path: engine

.github/workflows/scorecards-analysis.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
         with:
           persist-credentials: false
       - name: "Run analysis"
@@ -41,7 +41,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/third_party_scan.yml

@@ -21,17 +21,17 @@ jobs:
       contents: read
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
         with:
           persist-credentials: false
       - name: "setup python"
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
         with:
           python-version: '3.7.7' # install the python version needed
       - 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@5d5d22a31266ced268874388b861e4b58bb5c2f3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
         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.6.2-beta1"
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.7.1"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

.gitignore

@@ -34,7 +34,6 @@ xcuserdata
 *.log
 *.pyc
 *.swp
-.DS_Store
 .atom/
 .buildlog/
 .history
@@ -76,7 +75,6 @@ unlinked_spec.ds
 **/android/gradlew
 **/android/gradlew.bat
 **/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
 *.jks
 
@@ -131,11 +129,19 @@ app.*.symbols
 # Prebuilt binaries.
 /prebuilts/
 
+# TODO(67373): This entry is temporarily disabled, but can be restored once the
+# buildmoot is completed.
 # GN build support for protobufs vended by Fuchsia.
-/build/secondary/third_party/protobuf
+# /build/secondary/third_party/protobuf
+
+# Build tools vended from CIPD
+/buildtools
 
 # RBE support configurations and scripts vended from CIPD
 /build/rbe
 
 # The test-scripts from Chromium and managed by DEPS and gclient.
 /tools/fuchsia/test_scripts
+
+# The gn-sdk from Chromium and managed by DEPS and gclient.
+/tools/fuchsia/gn-sdk

BUILD.gn

@@ -141,6 +141,7 @@ group("flutter") {
       "//flutter/display_list:display_list_benchmarks",
       "//flutter/display_list:display_list_builder_benchmarks",
       "//flutter/display_list:display_list_region_benchmarks",
+      "//flutter/display_list:display_list_transform_benchmarks",
       "//flutter/fml:fml_benchmarks",
       "//flutter/impeller/aiks:canvas_benchmarks",
       "//flutter/impeller/geometry:geometry_benchmarks",
@@ -154,20 +155,18 @@ group("flutter") {
       (is_ios || is_android)) {
     public_deps += [ "//flutter/testing/scenario_app" ]
   }
-
-  if (is_android && flutter_runtime_mode == "profile" &&
-      current_cpu == "arm64") {
-    public_deps += [ "//flutter/testing/android_background_image" ]
-  }
 }
 
 group("unittests") {
   testonly = true
 
   public_deps = []
   if (is_android) {
-    public_deps +=
-        [ "//flutter/shell/platform/android:flutter_shell_native_unittests" ]
+    public_deps += [
+      "//flutter/impeller/toolkit/android:apk_unittests",
+      "//flutter/impeller/toolkit/android:unittests",
+      "//flutter/shell/platform/android:flutter_shell_native_unittests",
+    ]
   }
 
   if (is_ios) {