Merge branch 'main' into skwasm_scene

.ci.yaml

@@ -362,6 +362,13 @@ targets:
       $flutter/osx_sdk : >-
         { "sdk_version": "14a5294e" }
 
+  - name: Mac mac_unopt
+    bringup: true
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: mac_unopt
+      add_recipes_cq: "true"
+
   - name: Mac Unopt
     recipe: engine/engine_unopt
     properties:

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': 'c162dae2b29713736750af2e39f1acf5d458478f',
+  'skia_revision': '1d1783aa55c3c554c84f2b360e65f70f5ee3591c',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,27 +48,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': 'f97b9d9b2f6454c258042ada26309a9126d0da73',
+  'dart_revision': '36ace2c92e0ac43c1274450026a7ede1ca5f740d',
 
   # 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': 'b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9',
   'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
   'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
-  'dart_browser_launcher_rev': 'bc2dc4ef53a6619032e9f01450848e9ed40a9437',
-  'dart_clock_rev': '984642ee406e951e398ae5e47671383990da1c98',
-  'dart_collection_rev': '30fd0f8af28bce036bec94ae6852fc330ce56f41',
+  'dart_browser_launcher_rev': 'ba4e02851d2e3d5b2889c6b44f6189baea584ce1',
+  'dart_clock_rev': '93d9f56106fdba330bc8fade194038a5561ec730',
+  'dart_collection_rev': '9db854d03529ccf8d0d665868ded65a4c1403c0f',
   'dart_devtools_rev': '0d0b7c113bf7bde43181564820d56bd95173ff94',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
   'dart_protobuf_gn_rev': 'f872f05cb0378eef9a7a2609076929f0f35b4141',
   'dart_protobuf_rev': 'b90a4c44d56075eb23ee38ae56ce0febfd7f280f',
   'dart_pub_rev': '196e89e5716d64b2954021e6ac9bb5a20d975fc6',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
-  'dart_watcher_rev': '5968409e1d73e21e75fc22a6481d5efaef7f3558',
-  'dart_webdev_rev': 'b139649e8381a36ed72c4f823eb2af6ddc1e8bc4',
+  'dart_watcher_rev': '00aa79b0ff5562c9dafb0525891e2e69c51be06d',
+  'dart_webdev_rev': 'e887316c2352524baaf3b2e5aadd15ba0773edf6',
   'dart_webkit_inspection_protocol_rev': '8401098ace995e4dcd9855a2741c2dacccaa780b',
-  'dart_yaml_edit_rev': 'fbc5cb3ced4b9862b8acfd646389d4fbbd4074d1',
+  'dart_yaml_edit_rev': '386fd331f206e0cb1d081cd76a4fe92fe016c99d',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -317,16 +317,16 @@ deps = {
    {'packages': [{'version': 'git_revision:0d0b7c113bf7bde43181564820d56bd95173ff94', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
 
   'src/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@7a5e3b07c882d300a570031df8a45f8a0b067053',
+   Var('dart_git') + '/args.git@5ac2ba1d93f037c7aee2975703bf071f88597a76',
 
   'src/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@f454380c2691728530e0b2421af7676a9621481b',
+   Var('dart_git') + '/async.git@012781315e0f4659bc8d7806352e350e8fff8048',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@53871c5fe36438b734a0f75c91055e75111a7210',
+   Var('dart_git') + '/bazel_worker.git@d5f88375b41def124aa65be1d4da8a2c9e82e076',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@16e6ad3c8000e08a7f1c213aef2a692d872a16c7',
+   Var('dart_git') + '/boolean_selector.git@28dc03d893e5ac4141b48d8e7ef80eacb04de071',
 
   'src/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
@@ -341,19 +341,19 @@ deps = {
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
 
   'src/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@83886e3fd895211a98e49b7595a92796fa216641',
+   Var('dart_git') + '/convert.git@8812e4034235bf90e89eea7635e10512a35d62e6',
 
   'src/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@9efb888e9b06489bd7c861b1d01f4c4eebb05b60',
+   Var('dart_git') + '/crypto.git@8a03816370b2f856ab52bf302472a7bf1286094d',
 
   'src/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@d32bdd49026e66c139b37244e0eb2f098ae4cc22',
+   Var('dart_git') + '/csslib.git@5836863a4e73da8fb88b9a65901eb653339b1196',
 
   'src/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@568333db2650e77c0f96ebc77969c9469cf514f0',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@9be04e0c85584b261c7edec312a3fa0a84dcb21f',
+   Var('dart_git') + '/dartdoc.git@1a7952b13858ed307185a28f9b4ea861c0abb1c5',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@04fa38ab45cb2957f9059e03031b53906c2c4385',
@@ -362,55 +362,55 @@ deps = {
    Var('dart_git') + '/external/github.com/google/file.dart@72a67c33f90bfb7e10057e286e06d2fe3baa4d98',
 
   'src/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@f8379d94436f3a73f71ea078f3207897c6700498',
+   Var('dart_git') + '/fixnum.git@92ec336bbd0d03e02be0208483bdfaf68b4b6b7c',
 
   'src/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@f378dc8734f9f2413e93951f95d278420e4a03e0',
+   Var('dart_git') + '/glob.git@eaa878b6af1ec7f7deeab0d2f9e830a7a7da2a8c',
 
   'src/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@08643e9e2baac0f20ce4a3b8baed820107972270',
+   Var('dart_git') + '/html.git@57b747d7052aba08901adb366ffb2836facaa04d',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@74f9d3df83545f83338794d1decc28d10a94d290',
+   Var('dart_git') + '/http.git@ffb44388762716f8d93aaa8541f8c5f2de159b71',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@7bd190c70288361ed01ad31668e93544bcc5cf2b',
+   Var('dart_git') + '/http_multi_server.git@e0b5d357890eb09f0a7b3d26ddf643dee6977c4b',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@b3b283b9f139640b932d604e8815460bbd3ecab5',
+   Var('dart_git') + '/http_parser.git@bbe37dd228ec59f58a73df4b328ef747757165c7',
 
   'src/third_party/dart/third_party/pkg/intl':
    Var('dart_git') + '/intl.git@a958db01c90d041f0cd357d1732ae9813b620ee0',
 
   'src/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@aea3bea2d2be0113593a5c813d2ed3d2362200b6',
+   Var('dart_git') + '/json_rpc_2.git@5da270592006e4d43fd5a6ac736829f955881240',
 
   'src/third_party/dart/third_party/pkg/linter':
    Var('dart_git') + '/linter.git@b56190503725de2125b626ff1b3423192fa1f7ae',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@abef3717d958158eb8b0ddb2871f4b15a9804cd4',
+   Var('dart_git') + '/logging.git@787030a2b3d0d5d53ce57f1c7dc74f27ecb07b0b',
 
   'src/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@d437c85188806fe2bfa4f3616159300ba9dc6d2a',
 
   'src/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@61f43473951ce425982c2cfb694f3fbe50b1655e',
+   Var('dart_git') + '/matcher.git@cb6b68c603d2c57a51bbddfff08fa211bba7dcd3',
 
   'src/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@1a51be02b3cbc742c79d83575bd096ae8c295c1f',
+   Var('dart_git') + '/mime.git@2d8496df6a6e851816610c3f99eae0d9663f54c4',
 
   'src/third_party/dart/third_party/pkg/mockito':
    Var('dart_git') + '/mockito.git@28e8eda2ef16f2e9c5e2e8fef48a834afd33ce44',
 
   'src/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@74ac1cb90ad7f4f05bd92c952eaf9756c516fca3',
+   Var('dart_git') + '/package_config.git@7e09db12e968482ef81e309de3ce233463b4cd7e',
 
   'src/third_party/dart/third_party/pkg/path':
-   Var('dart_git') + '/path.git@cd37179fe802853f0a5967d3eceb0269e1834b32',
+   Var('dart_git') + '/path.git@23e33194c4073c0fdd818a70dd944afd5ad206e6',
 
   'src/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@338bfb4e96ba04ae166a5d76249f66fb8284f4b3',
+   Var('dart_git') + '/pool.git@650e5d3eff10529c65ef45b5fcb4bca270c7ea8f',
 
   'src/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -419,7 +419,7 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@c0e6ea74ccfbfdb2ef54c7cd9ad31455ca8e481f',
+   Var('dart_git') + '/pub_semver.git@860e3d825ff7ff9f3422091fe5948f5fd0fb0dcd',
 
   'src/third_party/dart/third_party/pkg/shelf':
    Var('dart_git') + '/shelf.git@9a792b49f07bd9d310d83cd103035cc60a9956af',
@@ -428,46 +428,46 @@ deps = {
    Var('dart_git') + '/source_map_stack_trace.git@08a81a81710fe1442a705c5761bccf3280940a9c',
 
   'src/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@a112e981a985a8af2047ee25a9cf56b0d5413b02',
+   Var('dart_git') + '/source_maps.git@0a4b030b381996c203f054f4f3f93cd256fec83a',
 
   'src/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@3951ba50ec29b9870c3131c6ddcc88700d26f3ee',
+   Var('dart_git') + '/source_span.git@b739fbf161e0b3058d6fda6f95953b359afdd0fb',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@8c3efdcf6ee823425b78e17d1347e5b800a0186e',
+   Var('dart_git') + '/sse.git@11e83a0810c06b6f468ca8f50117ab97fcf9c92e',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@6ceb191ace71c18ccf5648f6b2e8be52da39c56f',
+   Var('dart_git') + '/stack_trace.git@9c1b1c506053e98602957b79f45930b31ffdba29',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@fe0f5e4f5a308eb5f05bbb9d0f52a68485538c36',
+   Var('dart_git') + '/stream_channel.git@74646ea6d87cf3b3ef5b08656b2afd326e4e5beb',
 
   'src/third_party/dart/third_party/pkg/string_scanner':
    Var('dart_git') + '/string_scanner.git@f7a656fdaaab069fc6f8c9d34d3205ce6100dfb1',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@d275a8f7482b6a5e4f15d0da6feb66c24f52eb94',
+   Var('dart_git') + '/term_glyph.git@f6856e264f8f88309be36a7eed6defce2ab38b24',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@a01b185ea7939b0867361693d2a85d9865c876fd',
+   Var('dart_git') + '/test.git@8ea42987b0fee4a31ec97c101d0c66a461bf18f3',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@a85a930ad3736f93b96f6cc104d3576c1ae19e0e',
 
   'src/third_party/dart/third_party/pkg/tools':
-   Var('dart_git') + '/tools.git@d40ca93ca6ffc42e90cdbff742ce279a5d4ef808',
+   Var('dart_git') + '/tools.git@0304fbbb42989abd9ab6bbdfad26d830c96a7574',
 
   'src/third_party/dart/third_party/pkg/typed_data':
    Var('dart_git') + '/typed_data.git@d85363d2efb333afce07ec409a529ec32986e1a2',
 
   'src/third_party/dart/third_party/pkg/usage':
-   Var('dart_git') + '/usage.git@399770f45ed2d384d79395c0341a04fb25609a4d',
+   Var('dart_git') + '/usage.git@0698711985b332432ce9a901bbbd3b1ed227b090',
 
   'src/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@e2fe7f665997ab8e28aa76a8b26483f9903221a8',
+   Var('dart_git') + '/web_socket_channel.git@40eb2360e10595c2eab33cf61439c45708eb8d29',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -476,7 +476,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'src/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@0f80b12978f066b3547632dec4a273649138fae4',
+   Var('dart_git') + '/yaml.git@56dfaf4fb021ac1c0f1a469e7c8e71ea4f7add2f',
 
   'src/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),

ci/builders/mac_host_engine.json

@@ -32,14 +32,31 @@
             "ninja": {
                 "config": "host_debug",
                 "targets": [
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:dart_sdk_archive",
-                    "flutter/build/archives:archive_gen_snapshot",
-                    "flutter/build/archives:flutter_embedder_framework"
+                    "flutter/build/archives:flutter_embedder_framework",
+		    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/tools/font-subset",
+                    "flutter:unittests"
                 ]
             },
-            "tests": []
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug",
+                    "parameters": [
+                        "--variant",
+                        "host_debug",
+                        "--type",
+                        "dart",
+                        "--engine-capture-core-dump"
+                    ],
+                    "script": "flutter/testing/run_tests.py",
+                    "type": "local"
+                }
+	    ]
         },
         {
             "archives": [
@@ -71,9 +88,10 @@
             "ninja": {
                 "config": "host_profile",
                 "targets": [
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+		    "flutter/build/dart:copy_dart_sdk",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter:unittests"
                 ]
             },
@@ -85,7 +103,7 @@
                         "--variant",
                         "host_profile",
                         "--type",
-                        "engine",
+                        "dart,engine",
                         "--engine-capture-core-dump"
                     ],
                     "script": "flutter/testing/run_tests.py",
@@ -129,20 +147,22 @@
                 "targets": [
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
+		    "flutter/build/dart:copy_dart_sdk",
                     "flutter/impeller/golden_tests:impeller_golden_tests",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
-                    "flutter/tools/font-subset"
+                    "flutter/tools/font-subset",
+                    "flutter:unittests"
                 ]
             },
             "tests": [
                 {
                     "language": "python3",
-                    "name": "Impeller golden Tests for host_release",
+                    "name": "Impeller-golden, dart and engine tests for host_release",
                     "parameters": [
                         "--variant",
                         "host_release",
                         "--type",
-                        "impeller-golden"
+                        "dart,engine,impeller-golden"
                     ],
                     "script": "flutter/testing/run_tests.py",
                     "type": "local"
@@ -182,9 +202,10 @@
             "ninja": {
                 "config": "mac_debug_arm64",
                 "targets": [
-                    "flutter/build/archives:dart_sdk_archive",
+		    "flutter/tools/font-subset",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
+                    "flutter/build/archives:dart_sdk_archive",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
@@ -195,7 +216,9 @@
                 {
                     "base_path": "out/mac_profile_arm64/zip_archives/",
                     "type": "gcs",
-                    "include_paths": [],
+                    "include_paths": [
+                        "out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip"
+		    ],
                     "name": "mac_profile_arm64"
                 }
             ],
@@ -220,7 +243,7 @@
             "ninja": {
                 "config": "mac_profile_arm64",
                 "targets": [
-                    "flutter/build/archives:archive_gen_snapshot",
+                    "flutter/build/archives:artifacts",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
@@ -232,7 +255,8 @@
                     "base_path": "out/mac_release_arm64/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip"
+                        "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip",
+                        "out/mac_release_arm64/zip_archives/darwin-arm64-release/artifacts.zip"
                     ],
                     "name": "mac_release_arm64"
                 }
@@ -258,9 +282,9 @@
             "ninja": {
                 "config": "mac_release_arm64",
                 "targets": [
-                    "flutter/build/archives:archive_gen_snapshot",
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
-                    "flutter/tools/font-subset"
+                    "flutter/tools/font-subset",
+                    "flutter/build/archives:artifacts",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
             "tests": []