Merge branch 'main' into align_path

.ci.yaml

@@ -98,9 +98,10 @@ targets:
     bringup: true
     enabled_branches:
       - main
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
     properties:
       config_name: linux_android_emulator_skia
+      kvm: "1"
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
@@ -118,9 +119,10 @@ targets:
   - name: Linux linux_android_emulator_skia_tests_34
     enabled_branches:
       - main
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
     properties:
       config_name: linux_android_emulator_skia_34
+      kvm: "1"
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
@@ -382,7 +384,7 @@ targets:
       - flutter_frontend_server/**
 
   - name: Linux clangd
-    recipe: engine_v2/engine_v2
+    recipe: engine_v2/builder
     properties:
       config_name: linux_unopt_debug_no_rbe
 

.gitignore

@@ -48,6 +48,7 @@ xcuserdata
 .classpath
 .project
 .settings/
+.vscode/
 
 # packages file containing multi-root paths
 .packages.generated

BUILD.gn

@@ -210,6 +210,7 @@ group("unittests") {
       public_deps += [
         "//flutter/impeller:impeller_dart_unittests",
         "//flutter/impeller:impeller_unittests",
+        "//flutter/impeller/toolkit/interop:example",
       ]
     }
 

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': '515a23f3cbe1e2f54ffa6821e6da6f4891763f47',
+  'skia_revision': 'acb93a9f241fcc925d50875cc70d4a04e4ea8eba',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,16 +56,16 @@ 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': '23fc7751b8b264ee408c59d3ed558c257ccc2b52',
+  'dart_revision': '419aef963b5a7c47671856985abb42472fb2ba9c',
 
   # 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': 'fa98c77e7a2fee21a4ad3528dd79da0f4df6bd0f',
+  'dart_browser_launcher_rev': '0acd18820afe8751b164c7576cfe23c46e1e34c2',
   'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
-  'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
+  'dart_collection_rev': '24b75d85df6a26aac7be13b56ff1ce4360c04a64',
   'dart_devtools_rev': 'f363ca0a9d233cbf238465185ab09d90cbcc75dd',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
@@ -74,9 +74,9 @@ vars = {
   'dart_pub_rev': '31fa75baa5872e7f094a554c0ec7741742889530',
   'dart_tools_rev': 'b98c535537101eff0484ba279bd4090a5b9ac2ad',
   'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
-  'dart_web_rev': 'fb3019264edbed87b40c29d7777b2f98ae562008',
+  'dart_web_rev': '933a37d2235a63fd63185b3055d6bc0fd23edcfd',
   'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
-  'dart_webkit_inspection_protocol_rev': '119b877ae82bd2ca4cf7e5144d3a5ec104055164',
+  'dart_webkit_inspection_protocol_rev': 'e7418d7bbd98ef9c4051454dab83fd05f97bbdf9',
   'dart_yaml_edit_rev': '5c54d455f272bbb83c948ac420c677371e69ae77',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -234,7 +234,6 @@ vars = {
   "upstream_term_glyph": "https://github.com/dart-lang/term_glyph.git",
   "upstream_test_reflective_loader": "https://github.com/dart-lang/test_reflective_loader.git",
   "upstream_test": "https://github.com/dart-lang/test.git",
-  "upstream_tinygltf": "https://github.com/syoyo/tinygltf.git",
   "upstream_typed_data": "https://github.com/dart-lang/typed_data.git",
   "upstream_usage": "https://github.com/dart-lang/usage.git",
   "upstream_vector_math": "https://github.com/google/vector_math.dart.git",
@@ -351,7 +350,7 @@ deps = {
    {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:f363ca0a9d233cbf238465185ab09d90cbcc75dd'}]},
 
   'src/flutter/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',
+   Var('dart_git') + '/args.git@e623652744c82533829f2e62b1aba1a6cf06e291',
 
   'src/flutter/third_party/dart/third_party/pkg/async':
    Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
@@ -381,7 +380,7 @@ deps = {
    Var('dart_git') + '/crypto.git@eede7d6918c51159c1422b7449f40dbac660ee57',
 
   'src/flutter/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@192d720f121792ab05ca157ea280edc7e0410e9c',
+   Var('dart_git') + '/csslib.git@d486627ec2c014a1fbf653a593043c6b1e3a0eb5',
 
   'src/flutter/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@5d35f4d829ffb8532d345d95d3e9504ae6cd839e',
@@ -399,10 +398,10 @@ deps = {
    Var('dart_git') + '/glob.git@8b05be87f84f74d90dc0c15956f3ff95805322e5',
 
   'src/flutter/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
+   Var('dart_git') + '/html.git@5516387611d848decb77ed9430904b5cd0f0b78c',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@b97b8dc22ea808c4fbd63f73abd7af8ecf694323',
+   Var('dart_git') + '/http.git@dfeecf0a495925456ff5d0216a559dcc422bb4a1',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
@@ -429,10 +428,10 @@ deps = {
    Var('dart_git') + '/matcher.git@d6d573d0f8d65b36550ce62aad3ce6b5e987b642',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
+   Var('dart_git') + '/mockito.git@d0fda0ce7883fed0238be9c3698fed0c3632c3e3',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@75805b2f46d747643af3fb71c2abc84296ba4e32',
+   Var('dart_git') + '/native.git@20f8160b54b9b209390d51b6e3edec4ab0c65009',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@76934c2ca25922ec72909bbff7dfbddaf0d02bd9',
@@ -453,7 +452,7 @@ deps = {
    Var('dart_git') + '/pub_semver.git@d9e5ee68a350fbf4319bd4dfcb895fc016337d3a',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@9f2dffecbe8f219146a077e401758602752d486a',
+   Var('dart_git') + '/shelf.git@d53a8f9a98ccbe69078d397d45c2c6b3e7c243b6',
 
   'src/flutter/third_party/dart/third_party/pkg/source_maps':
    Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',
@@ -480,7 +479,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@cd3dbd51fe765f7243ea51783318d82b4031fa7a',
+   Var('dart_git') + '/test.git@9a2d155b648ecf3c2e979233ee5e94d199a7d6dd',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -489,7 +488,7 @@ deps = {
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@365468a74251c930a463daf5b8f13227e269111a',
+   Var('dart_git') + '/typed_data.git@2bb9e6ead6394e2d4ec6068c5ece8b2ec0e2b945',
 
   'src/flutter/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
@@ -507,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@a645c3905fc3cc2bbd3def9879ba8dedd26e3aa5',
+   Var('dart_git') + '/yaml.git@b3d299eee5e68135c46d913d3e5b637daad27c85',
 
   'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -715,9 +714,6 @@ deps = {
   'src/flutter/third_party/imgui':
   Var('flutter_git') + '/third_party/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d',
 
-  'src/flutter/third_party/tinygltf':
-  Var('flutter_git') + '/third_party/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
-
   'src/flutter/third_party/json':
   Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
 
@@ -964,7 +960,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '3YH1DEYJ-s93fHBw5YF3s-d0q40hqjb2-MmAPHb94iwC'
+        'version': '-kKh_AYzPh_iEmTxKBbtNwlmYMh9MBAnyO1BTFhQjUAC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',