Merge branch 'main' into master

Author: LoveJello

.ci.yaml

@@ -329,7 +329,7 @@ targets:
         {"download_emsdk": true}
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:114.0"},
+          {"dependency": "chrome_and_driver", "version": "version:115.0"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
       framework: "true"

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': '401c85ab1e21caf65a1b33afa9ff43b7ed7eb0f2',
+  'skia_revision': '177897b13a891ed45df141c4041142cd0208fc54',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,16 +53,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': '603aacd8400ff58fb6bcb9aa5f80b5ee1e121c8f',
+  'dart_revision': 'aca45d2e133cf6382e626072eec22bdd3c817945',
 
   # 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_binaryen_rev': 'cdb7aeab40b4c522de20b242019f7e88641445d5',
   'dart_boringssl_gen_rev': 'a468ba9fec3f59edf46a7db98caaca893e1e4d96',
   'dart_boringssl_rev': '74646566e93de7551bfdfc5f49de7462f13d1d05',
   'dart_browser_launcher_rev': '27ec600af41b0d0ebe9a3db6ad36e9ed11976b84',
   'dart_clock_rev': '263e508a36ed90e4d85b60dd70552d20e71a9ae9',
-  'dart_collection_rev': 'db343da9fa9653882951c64a05df2eba63a02e21',
+  'dart_collection_rev': '0a2885a90717cc9322faaa6a7365b69e06b531dc',
   'dart_devtools_rev': '99dca813aaa7fa23ccd6fe3901ac7665e96db3cb',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
@@ -329,7 +329,7 @@ deps = {
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/third_party/binaryen/src':
-   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9',
+   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@cdb7aeab40b4c522de20b242019f7e88641445d5',
 
   'src/third_party/dart/third_party/devtools':
    {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:99dca813aaa7fa23ccd6fe3901ac7665e96db3cb'}]},
@@ -371,7 +371,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@06d72882b1d3889a8a41992dbe09d4d97a14d299',
+   Var('dart_git') + '/dartdoc.git@e8d00c079d83e9ee465cfeb9702eb2da765070d9',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@f01dfca0b3c9a63155bfb86aae12be982571a860',
@@ -389,7 +389,7 @@ deps = {
    Var('dart_git') + '/html.git@4060496b0443451c38f8b789db2e44c0d7966171',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@b2067710f88980fc0fee43ec3380bce089f001db',
+   Var('dart_git') + '/http.git@1a42b4a16636e86b5fed60666b0de91219c5110c',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@aa128cfaf6ef1c9c1ace962ca2dcf6e5dddad441',
@@ -404,31 +404,31 @@ deps = {
    Var('dart_git') + '/json_rpc_2.git@509f71eef90ec5afb5486b69dab7fed97b9f1eef',
 
   'src/third_party/dart/third_party/pkg/leak_tracker':
-   Var('dart_git') + '/leak_tracker.git@515612e0f7b5e2477a82341a302814ef2647ed6e',
+   Var('dart_git') + '/leak_tracker.git@098bafcf99a5220e3c352d895d991e163568ee03',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@6c1920198fc92af215297043609cecb4ac487a2a',
+   Var('dart_git') + '/linter.git@9a4bc7910d1ea2660deadae4c212776e9cf6212e',
 
   'src/third_party/dart/third_party/pkg/logging':
    Var('dart_git') + '/logging.git@521498757ed3eeae151c2d4796404e8947baa04c',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@ee4e1b36f21a6815385b157f8fff12af28bdcf9a',
+   Var('dart_git') + '/markdown.git@faabb1ab9adc076a2df2349a0c8b939c92f70ca7',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@ce8f40934c90e12992071172795b3bca29fac295',
 
   'src/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@bdb66bdd354156280bddc30e2d322a4ad355f671',
+   Var('dart_git') + '/mime.git@799b398140817fdb134f639d84e91c552e129136',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@afa20a80ef3147845fc78c80ace9d66f0ceb0453',
+   Var('dart_git') + '/mockito.git@b4217750cbab5cdd2a773106abb476a7ea4aefb2',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@7c474e1f935c134d2e1a4f5e54593e6d63a674ed',
+   Var('dart_git') + '/native.git@2598ac66148f5b6a44d8f6bf01643c6b1c49e590',
 
   'src/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@be0c4411cb7607abe3fd531c9653b0ba53c87c0f',
+   Var('dart_git') + '/package_config.git@981c49dfec1e3e3e90f336dcd7c225923d2fd321',
 
   'src/third_party/dart/third_party/pkg/path':
    Var('dart_git') + '/path.git@282dd18bd9ae2e265ea40a29b2c637194e9be8b7',
@@ -467,13 +467,13 @@ deps = {
    Var('dart_git') + '/stream_channel.git@e54234f94da929153b012de2bba75c5246a52538',
 
   'src/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@35657e2ae381612468aa2c432e89d7357c0b568c',
+   Var('dart_git') + '/string_scanner.git@413b57a3b14fa273e8ed52578edfbe0446084795',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
    Var('dart_git') + '/term_glyph.git@423700a3c019dc67f93d2bd6578016a1402506f7',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@a92b5bb3ffea95ad1d1f77f6d5a07c3ef4ee2139',
+   Var('dart_git') + '/test.git@7f81deeac294a1120917aeaa35d5b670146c4529',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@0bfaad91ed308ce9da11b48395c8210d7542c16b',
@@ -491,7 +491,7 @@ deps = {
    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@7ae4d0f31f700747bfe9fbfc0b7ec860d46f7755',
+   Var('dart_git') + '/web_socket_channel.git@4d1b5438d1bdfc6317bf99fd9d9c6e4edb7e9ec5',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -626,16 +626,11 @@ deps = {
   'src/third_party/pyyaml':
    Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
 
-   # Upstream Khronos Vulkan Headers are part of vulkan-deps
-   # Downstream Fuchsia Vulkan Headers (v1.2.198)
-  'src/third_party/fuchsia-vulkan':
-   Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '32640ad82ef648768c706c9bf828b77123a09bc2',
-
    'src/third_party/swiftshader':
    Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5f9ed9b16931c7155171d31f75004f73f0a3abc8',
 
    'src/third_party/angle':
-   Var('chromium_git') + '/angle/angle.git' + '@' + 'a4c283be741f95b48a6369b8e6bed53ee0ff5fac',
+   Var('chromium_git') + '/angle/angle.git' + '@' + '6dc0c9d62755a538bf82604a7aaf22efc0f2327a',
 
    'src/third_party/vulkan_memory_allocator':
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
@@ -889,7 +884,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'SmAtKPfGzPllC9gfOpu2NtueRGB1spsiuLFWR8bhThoC'
+        'version': 'Dd4To9QyMtoPGPIplD3HfhZe21ZbHJB7tHW2KWe9elcC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -899,7 +894,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'ZwCUlo28olVzLlqTljGEaAvE9GgjVdpEkfLlEIWXcx0C'
+        'version': 'wIpcCOc0TtDYasQblklIoNg4iEgxO-hlO4aTGflWrmYC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',
@@ -927,7 +922,7 @@ deps = {
       'packages': [
         {
           'package': 'flutter/flutter_font_fallbacks',
-          'version': 'f7459e412c5cfba5a654e96a5a00fff61e018d16b8b1c41dade17b7c6aa92299'
+          'version': 'fb4add6305d783cdb1e722dbb24b135d13faced57905fb814d7964113be2f84a'
         }
       ],
       'dep_type': 'cipd',

build/archives/BUILD.gn

@@ -26,12 +26,10 @@ if (build_engine_artifacts && !is_android) {
     deps = [
       "//flutter/flutter_frontend_server:frontend_server",
       "//flutter/impeller/compiler:impellerc",
-      "//flutter/impeller/compiler:impellerc_license",
       "//flutter/impeller/tessellator:tessellator_shared",
       "//flutter/lib/snapshot:generate_snapshot_bin",
       "//flutter/shell/testing:testing",
       "//flutter/tools/path_ops:path_ops",
-      "//flutter/tools/path_ops:path_ops_license",
       "//third_party/dart/runtime/bin:gen_snapshot",
     ]
     if (is_mac) {
@@ -81,16 +79,6 @@ if (build_engine_artifacts && !is_android) {
           source = "$root_out_dir/flutter_tester$exe"
           destination = "flutter_tester$exe"
         },
-        {
-          source =
-              "$root_out_dir/gen/flutter/impeller/compiler/LICENSE.impellerc.md"
-          destination = "LICENSE.impellerc.md"
-        },
-        {
-          source =
-              "$root_out_dir/gen/flutter/tools/path_ops/LICENSE.path_ops.md"
-          destination = "LICENSE.path_ops.md"
-        },
         {
           source = "$root_out_dir/impellerc$exe"
           destination = "impellerc$exe"

build/zip_bundle.gni

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//flutter/common/config.gni")
+import("//flutter/shell/version/version.gni")
 
 if (flutter_runtime_mode == "jit_release") {
   android_zip_archive_dir = "android-$target_cpu-jit-release"
@@ -38,16 +39,41 @@ if (flutter_runtime_mode == "jit_release") {
 template("zip_bundle") {
   assert(defined(invoker.output), "output must be defined")
   assert(defined(invoker.files), "files must be defined as a list of scopes")
+
+  license_readme = "$target_gen_dir/LICENSE.$target_name.md"
+  license_target = "_${target_name}_license_md"
+
+  generated_file(license_target) {
+    source_path = rebase_path(".", "//flutter")
+    license_path =
+        rebase_path("//flutter/sky/packages/sky_engine/LICENSE", "//flutter")
+    git_url = "https://github.com/flutter/engine/tree/$engine_version"
+    sky_engine_url = "https://storage.googleapis.com/flutter_infra_release/flutter/$engine_version/sky_engine.zip"
+    outputs = [ license_readme ]
+    contents = [
+      "# $target_name",
+      "",
+      "This bundle is part of the the Flutter SDK.",
+      "",
+      "The source code is hosted at [flutter/engine/$source_path]($git_url/$source_path).",
+      "The license for this bundle is hosted at [flutter/engine/sky/packages/sky_engine/LICENSE]($git_url/$license_path) ",
+      "and [sky_engine.zip]($sky_engine_url).",
+    ]
+  }
+
   action(target_name) {
     script = "//flutter/build/zip.py"
     outputs = [ "$root_build_dir/zip_archives/${invoker.output}" ]
-    sources = []
+    sources = [ license_readme ]
     forward_variables_from(invoker, [ "visibility" ])
-    deps = invoker.deps
+    deps = [ ":$license_target" ] + invoker.deps
 
     args = [
       "-o",
       rebase_path(outputs[0]),
+      "-i",
+      rebase_path(license_readme),
+      "LICENSE.$target_name.md",
     ]
     foreach(input, invoker.files) {
       args += [