Merge branch 'enable_exp_canvas' of github.com:jonahwilliams/engine into enable_exp_canvas

Author: jonahwilliams

.ci.yaml

@@ -45,9 +45,6 @@ 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:
@@ -57,6 +54,7 @@ targets:
       config_name: local_engine
 
   - name: Linux linux_android_emulator_tests
+    bringup: true
     enabled_branches:
       - main
     recipe: engine_v2/engine_v2
@@ -76,7 +74,28 @@ targets:
       - testing/scenario_app/**
       - testing/skia_gold_client/**
 
+  - name: Linux linux_android_emulator_tests_34
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_android_emulator_34
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    timeout: 90
+    runIf:
+      - .ci.yaml
+      - ci/builders/linux_android_emulator.json
+      - DEPS
+      - lib/ui/**
+      - shell/platform/android/**
+      - testing/scenario_app/**
+      - testing/skia_gold_client/**
+
   - name: Linux linux_android_emulator_skia_tests
+    bringup: true
     enabled_branches:
       - main
     recipe: engine_v2/engine_v2
@@ -96,6 +115,26 @@ targets:
       - testing/scenario_app/**
       - testing/skia_gold_client/**
 
+  - name: Linux linux_android_emulator_skia_tests_34
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_android_emulator_skia_34
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    timeout: 90
+    runIf:
+      - .ci.yaml
+      - 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:
       - main

.github/workflows/scorecards-analysis.yml

@@ -41,7 +41,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/third_party_scan.yml

@@ -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@0b2256b8c012f0828dc542b3febcab082c67f72b
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
         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.2"
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.8.3"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

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': '8f5705639815e9548b37f19f5cad7480d5fed586',
+  'skia_revision': '7c0eeaf12413f21b7b95f2d9f7e7857902f0a049',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,7 @@ 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': '35bc5c8661498781e80a8012359ad0c030c5af62',
+  'dart_revision': '44635f897535130373b7b07c9cf02694ef80fae4',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -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': '8WCo7tLjg_GoImlj5eax_w-wxsvRPnmaChqN4ok-5rYC',
+  'fuchsia_test_scripts_version': '-XDS8eBA0Le-zCEfWFgQWJQunl4ka-c4hboPGKa2qQQC',
 
   # 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.
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '2LTVy4Gv76DcMpz4VBhnwBBKhsSZssxsG-TYqSdMrKIC'
+        'version': 'qpfC-GAVZvOwAQU5fSbzWmOQevK_0p1ZCV0-Pw9O9LcC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

build/archives/BUILD.gn

@@ -31,7 +31,7 @@ generated_file("artifacts_entitlement_config") {
 # gen_snapshot_x64 are used in its place).
 #
 # Target-specific iOS artifacts.zip are produced in:
-# //flutter/sky/tools/create_full_ios_framework.py
+# //flutter/sky/tools/create_ios_framework.py
 #
 # Target-specific Android archives are produced in:
 # //flutter/shell/platform/android:gen_snapshot

build/config/fuchsia/gn_configs.gni

@@ -25,7 +25,7 @@ declare_args() {
 # value to specify the API level the packages produced from this repository
 # should be targeting, e.g. in their top-level //.gn file. A value of -1
 # means that no API level will be passed to the tools that consumes it.
-fuchsia_target_api_level = 19
+fuchsia_target_api_level = 22
 
 # The SDK manifest file. This is useful to include as a dependency
 # for some targets in order to cause a rebuild when the version of the

ci/builders/README.md

@@ -431,7 +431,7 @@ be relative to the checkout directory.
         "--simulator-arm64-out-dir",
         "out/ios_debug_sim_arm64"
     ],
-    "script": "flutter/sky/tools/create_full_ios_framework.py",
+    "script": "flutter/sky/tools/create_ios_framework.py",
     "language": "python3"
 }
 ```
@@ -657,7 +657,11 @@ copied verbatim from the executions details of the build.
 The following example will run the generator to create the ios artifacts:
 
 ```bash
-python3 flutter/sky/tools/create_full_ios_framework.py --dst out/release \
---arm64-out-dir out/ios_release --simulator-x64-out-dir out/ios_debug_sim \
---simulator-arm64-out-dir out/ios_debug_sim_arm64 --dsym --strip
+python3 flutter/sky/tools/create_ios_framework.py   \
+  --dst out/release                                 \
+  --arm64-out-dir out/ios_release                   \
+  --simulator-x64-out-dir out/ios_debug_sim         \
+  --simulator-arm64-out-dir out/ios_debug_sim_arm64 \
+  --dsym                                            \
+  --strip
 ```

ci/builders/linux_android_emulator.json

@@ -42,22 +42,22 @@
                     "test_dependencies": [
                         {
                             "dependency": "android_virtual_device",
-                            "version": "android_34_google_apis_x64.textpb"
+                            "version": "android_35_google_apis_x64.textpb"
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8759428741582061553"
+                            "version": "build_id:8740267484269553649"
                         }
                     ],
                     "contexts": [
                         "android_virtual_device"
                     ],
                     "script": "flutter/testing/run_tests.py",
                     "parameters": [
-                            "--android-variant",
-                            "ci/android_emulator_debug_x64",
-                            "--type",
-                            "android"
+                        "--android-variant",
+                        "ci/android_emulator_debug_x64",
+                        "--type",
+                        "android"
                     ]
                 },
                 {
@@ -74,11 +74,11 @@
                     "test_dependencies": [
                         {
                             "dependency": "android_virtual_device",
-                            "version": "android_34_google_apis_x64.textpb"
+                            "version": "android_35_google_apis_x64.textpb"
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8759428741582061553"
+                            "version": "build_id:8740267484269553649"
                         }
                     ],
                     "contexts": [
@@ -139,21 +139,21 @@
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8759428741582061553"
+                            "version": "build_id:8740267484269553649"
                         }
                     ],
                     "contexts": [
                         "android_virtual_device"
                     ],
                     "script": "flutter/testing/run_tests.py",
                     "parameters": [
-                            "--android-variant",
-                            "ci/android_emulator_debug_x86",
-                            "--type",
-                            "android"
+                        "--android-variant",
+                        "ci/android_emulator_debug_x86",
+                        "--type",
+                        "android"
                     ]
                 }
             ]
         }
     ]
-}
+}