Manual roll Dart SDK from d916a5f69a48 to 2bf0f2b8d391 (24 revisions) (flutter/engine#55884)

Manual roll requested by [asiva@google.com](mailto:asiva@google.com) https://dart.googlesource.com/sdk.git/+log/d916a5f69a48..2bf0f2b8d391 2024-10-15 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-23.0.dev 2024-10-14 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-22.0.dev 2024-10-14 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-21.0.dev 2024-10-14 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-20.0.dev 2024-10-12 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-19.0.dev 2024-10-12 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-18.0.dev 2024-10-12 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-17.0.dev 2024-10-12 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-16.0.dev 2024-10-11 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-15.0.dev 2024-10-11 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-14.0.dev 2024-10-11 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-13.0.dev 2024-10-11 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-12.0.dev 2024-10-10 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-11.0.dev 2024-10-10 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-10.0.dev 2024-10-10 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-9.0.dev 2024-10-10 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-8.0.dev 2024-10-10 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-7.0.dev 2024-10-09 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-6.0.dev 2024-10-09 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-5.0.dev 2024-10-09 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-4.0.dev 2024-10-09 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-3.0.dev 2024-10-09 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-2.0.dev 2024-10-09 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-1.0.dev 2024-10-08 [dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com](mailto:dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com) Version 3.7.0-0.0.dev --------- Co-authored-by: skia-flutter-autoroll <skia-flutter-autoroll@skia.org>
2026-02-20 02:29:02 +08:00 · 2024-10-15 18:37:05 -07:00 · 2024-10-15 18:37:05 -07:00 · f19aaeb32d
commit f19aaeb32d
parent 0157e502c4
8 changed files with 128 additions and 114 deletions
--- a/36
+++ b/36
@ -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': 'd916a5f69a486de98316900f19ef0ff46834b03d',
+  'dart_revision': '2bf0f2b8d39100b37b82fb8b936f2ecad1070af3',

  # WARNING: DO NOT EDIT MANUALLY
  # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@ -65,19 +65,19 @@ vars = {
  'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
  'dart_browser_launcher_rev': 'e5fc5d488eb5038bfec2a6690c72ab8dd353e101',
  'dart_clock_rev': '7956d60042f4ea979c4554d43eeb57d087627869',
-  'dart_collection_rev': '24b75d85df6a26aac7be13b56ff1ce4360c04a64',
+  'dart_collection_rev': '887b826b50f48d6a9cd2c0684aa353e8e3a0fad0',
  'dart_devtools_rev': 'dcef4f6efe986f110f55dbbe7f3731802e86690a',
  'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
  'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
  'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
  'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
  'dart_pub_rev': '1efd3f5e274e153637d99698b0ee454f6f2550ab',
-  'dart_tools_rev': 'd4995d47b99d5e9564abfed2218f4a23df75983b',
+  'dart_tools_rev': 'f882de9ba86712003728d4663e1b73a620d352b1',
  'dart_watcher_rev': '3b850778ad0b62db3aa2cfe48832870c2461db30',
  'dart_web_rev': '8478cd27d574249eca3d41f9135458dfda2762c8',
  'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
  'dart_webkit_inspection_protocol_rev': 'b459c427b74bf5e0919a083a97a167fb74d8bff1',
-  'dart_yaml_edit_rev': '5c54d455f272bbb83c948ac420c677371e69ae77',
+  'dart_yaml_edit_rev': '35f4248c7bbba289b3899fa55486e2f31ef1a8c5',

  'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1

@ -346,13 +346,13 @@ deps = {
   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@459bc0797f67cb2a8fd4598bb7143b34036608d9',

  'src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:f5e84f91b32b219d646cfb87a891cd143dc84056'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:dcef4f6efe986f110f55dbbe7f3731802e86690a'}]},

  'src/flutter/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@e623652744c82533829f2e62b1aba1a6cf06e291',
+   Var('dart_git') + '/args.git@09c0fca1785c9df39288a48f767994eed80bed40',

  'src/flutter/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
+   Var('dart_git') + '/async.git@5f70a996f673d625e3502597084653686c3e754c',

  'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
   Var('dart_git') + '/bazel_worker.git@aa3cc9e826350b960e0c5a67e6065bcedba8b0ac',
@ -373,10 +373,10 @@ deps = {
   Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),

  'src/flutter/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@9035cafefc1da4315f26058734d0c2a19d5ab56a',
+   Var('dart_git') + '/convert.git@d361833e117cb2438d2a2a6d0b0acb28ff0910fb',

  'src/flutter/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@eede7d6918c51159c1422b7449f40dbac660ee57',
+   Var('dart_git') + '/crypto.git@3d26ef4cf22d4b218ba30e616544ad3cf52f64a1',

  'src/flutter/third_party/dart/third_party/pkg/csslib':
   Var('dart_git') + '/csslib.git@a3700b05bbcc42782e8a7024790dbf019d89c249',
@ -385,7 +385,7 @@ deps = {
   Var('dart_git') + '/dart_style.git@5d35f4d829ffb8532d345d95d3e9504ae6cd839e',

  'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@5df03dd913a0a2e20421cac61112aa84111160e0',
+   Var('dart_git') + '/dartdoc.git@80c6f18f34b387d4b9ce89ddd2e3049093335f9d',

  'src/flutter/third_party/dart/third_party/pkg/file':
   Var('dart_git') + '/external/github.com/google/file.dart@6842feaef1c4e06239bd30f8d3ef722838b1c97e',
@ -406,13 +406,13 @@ deps = {
   Var('dart_git') + '/http_multi_server.git@e7515b5896b83d522189802a1e14e103e19426c0',

  'src/flutter/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',
+   Var('dart_git') + '/http_parser.git@23d775898ee90be9daf3297e298a8869bc755d84',

  'src/flutter/third_party/dart/third_party/pkg/intl':
   Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',

  'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@b4810dc7bee5828f240586c81f3f34853cacdbce',
+   Var('dart_git') + '/json_rpc_2.git@c9b616bded8cdb5bfdc836ba7648afa6aba40062',

  'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
   Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
@ -427,7 +427,7 @@ deps = {
   Var('dart_git') + '/matcher.git@31f13583630e093731c8cf2b843c14196d748c5c',

  'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@3de67548e833a8eef66a2a49070b197c2c08b3ab',
+   Var('dart_git') + '/mockito.git@57d484f9b8e7f6a504966a901174358a42fa932a',

  'src/flutter/third_party/dart/third_party/pkg/native':
   Var('dart_git') + '/native.git@659511886501bcce638c3966590df04984909ef0',
@ -439,7 +439,7 @@ deps = {
   Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',

  'src/flutter/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@924fb04353cec915d927f9f1aed88e2eda92b98a',
+   Var('dart_git') + '/pool.git@7bfc71b39742753a88688e56e55a828a2f5dc0bf',

  'src/flutter/third_party/dart/third_party/pkg/protobuf':
   Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@ -469,10 +469,10 @@ deps = {
   Var('dart_git') + '/stream_channel.git@f4407168b275fcde9187baefd7dbce76d0992825',

  'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@2139417ffcd0392bde3ba9bc83ee13eaa5fbed01',
+   Var('dart_git') + '/string_scanner.git@084b201c54b168aced178fff41fce71e3869ae42',

  'src/flutter/third_party/dart/third_party/pkg/tar':
-   Var('dart_git') + '/external/github.com/simolus3/tar.git@32ceb55e673141abff4e84b99483fe5eb881c291',
+   Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',

  'src/flutter/third_party/dart/third_party/pkg/term_glyph':
   Var('dart_git') + '/term_glyph.git@19d8c08a4e81122639129c62049896021910c932',
@ -487,7 +487,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@2bb9e6ead6394e2d4ec6068c5ece8b2ec0e2b945',
+   Var('dart_git') + '/typed_data.git@6abfafdcf661cd8a814619d7e2a3e99edb3a3862',

  'src/flutter/third_party/dart/third_party/pkg/watcher':
   Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
@ -496,7 +496,7 @@ deps = {
   Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),

  'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
+   Var('dart_git') + '/web_socket_channel.git@40aa29f1d2167467f5934d755891a8beb62a1239',

  'src/flutter/third_party/dart/third_party/pkg/webdev':
   Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
--- a/engine/src/flutter/analysis_options.yaml
+++ b/engine/src/flutter/analysis_options.yaml
@ -50,7 +50,6 @@ linter:
    - avoid_init_to_null
    - avoid_js_rounded_ints
    # - avoid_multiple_declarations_per_line # seems to be a stylistic choice we don't subscribe to
-    - avoid_null_checks_in_equality_operators
    # - avoid_positional_boolean_parameters # would have been nice to enable this but by now there's too many places that break it
    - avoid_print
    # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
--- a/engine/src/flutter/ci/licenses_golden/excluded_files
+++ b/engine/src/flutter/ci/licenses_golden/excluded_files
@ -1444,6 +1444,11 @@
 ../../../flutter/third_party/dart/runtime/tools/heapsnapshot/README.md
 ../../../flutter/third_party/dart/runtime/tools/heapsnapshot/pubspec.yaml
 ../../../flutter/third_party/dart/runtime/tools/heapsnapshot/test
+../../../flutter/third_party/dart/runtime/tools/profiling/.gitignore
+../../../flutter/third_party/dart/runtime/tools/profiling/CHANGELOG.md
+../../../flutter/third_party/dart/runtime/tools/profiling/README.md
+../../../flutter/third_party/dart/runtime/tools/profiling/analysis_options.yaml
+../../../flutter/third_party/dart/runtime/tools/profiling/pubspec.yaml
 ../../../flutter/third_party/dart/runtime/tools/utils.py
 ../../../flutter/third_party/dart/runtime/tools/valgrind.py
 ../../../flutter/third_party/dart/runtime/tools/wiki/README.md
@ -1565,7 +1570,7 @@
 ../../../flutter/third_party/dart/runtime/vm/port_test.cc
 ../../../flutter/third_party/dart/runtime/vm/profiler_test.cc
 ../../../flutter/third_party/dart/runtime/vm/protos/.gitignore
-../../../flutter/third_party/dart/runtime/vm/regexp_test.cc
+../../../flutter/third_party/dart/runtime/vm/regexp/regexp_test.cc
 ../../../flutter/third_party/dart/runtime/vm/ring_buffer_test.cc
 ../../../flutter/third_party/dart/runtime/vm/scopes_test.cc
 ../../../flutter/third_party/dart/runtime/vm/service
--- a/engine/src/flutter/ci/licenses_golden/licenses_dart
+++ b/engine/src/flutter/ci/licenses_golden/licenses_dart
@ -1,7 +1,8 @@
-Signature: 125335ea80d045b9f6f1a902f51abbc7
+Signature: 1009ec088c488875932614baa464cc41

 ====================================================================================================
 LIBRARY: dart
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/pprof/profile.proto
 ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/common/builtin_clock.proto
 ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot.proto
 ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.proto
@ -15,6 +16,7 @@ ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutte
 ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_descriptor.proto
 ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_event.proto
 TYPE: LicenseType.apache
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/pprof/profile.proto
 FILE: ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/common/builtin_clock.proto
 FILE: ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot.proto
 FILE: ../../../flutter/third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.proto
@ -1924,16 +1926,19 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/metrics.cc + ../../../flutt
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/metrics.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/object_graph.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/object_graph.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_ir.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_ir.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_ast.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_ast.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_parser.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_parser.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_ir.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_ir.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_ast.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_ast.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_parser.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_parser.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/unibrow-inl.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/unibrow.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/unibrow.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/report.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/report.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/ring_buffer.h + ../../../flutter/third_party/dart/LICENSE
@ -1942,9 +1947,6 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/simulator_arm64.cc + ../../
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/simulator_arm64.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/stack_frame_arm64.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/tags.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/unibrow-inl.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/unibrow.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/unibrow.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart + ../../../flutter/third_party/dart/LICENSE
@ -2016,16 +2018,19 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/metrics.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/metrics.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/object_graph.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/object_graph.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_ir.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_ir.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_ast.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_ast.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_parser.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_parser.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_ir.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_ir.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_ast.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_ast.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_parser.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_parser.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/unibrow-inl.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/unibrow.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/unibrow.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/report.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/report.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/ring_buffer.h
@ -2034,9 +2039,6 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/simulator_arm64.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/simulator_arm64.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/stack_frame_arm64.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/tags.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/unibrow-inl.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/unibrow.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/unibrow.h
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart
@ -2116,12 +2118,12 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/profiler_service.cc + ../..
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/profiler_service.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/program_visitor.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/program_visitor.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_bytecode.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_bytecode.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_bytecode_inl.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_bytecodes.h + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_interpreter.cc + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp_interpreter.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_bytecode.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_bytecode.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_bytecode_inl.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_bytecodes.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_interpreter.cc + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_interpreter.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/scope_timer.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/service_event.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/service_event.h + ../../../flutter/third_party/dart/LICENSE
@ -2195,12 +2197,12 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/profiler_service.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/profiler_service.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/program_visitor.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/program_visitor.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_bytecode.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_bytecode.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_assembler_bytecode_inl.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_bytecodes.h
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_interpreter.cc
-FILE: ../../../flutter/third_party/dart/runtime/vm/regexp_interpreter.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_bytecode.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_bytecode.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_assembler_bytecode_inl.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_bytecodes.h
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_interpreter.cc
+FILE: ../../../flutter/third_party/dart/runtime/vm/regexp/regexp_interpreter.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/scope_timer.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/service_event.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/service_event.h
@ -4074,6 +4076,11 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/platform/synchronization_posix
 ORIGIN: ../../../flutter/third_party/dart/runtime/platform/synchronization_win.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/platform/threads.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/tools/dartfuzz/flag_fuzzer.dart + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/tools/profiling/bin/convert_allocation_profile.dart + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/tools/profiling/bin/set_uprobe.dart + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/elf_utils.dart + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/perf/perf_data.dart + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/symbols.dart + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/bytecode_reader.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/bytecode_reader.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/compiler/assembler/disassembler_kbc.cc + ../../../flutter/third_party/dart/LICENSE
@ -4120,6 +4127,11 @@ FILE: ../../../flutter/third_party/dart/runtime/platform/synchronization_posix.c
 FILE: ../../../flutter/third_party/dart/runtime/platform/synchronization_win.cc
 FILE: ../../../flutter/third_party/dart/runtime/platform/threads.h
 FILE: ../../../flutter/third_party/dart/runtime/tools/dartfuzz/flag_fuzzer.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/bin/convert_allocation_profile.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/bin/set_uprobe.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/elf_utils.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/perf/perf_data.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/symbols.dart
 FILE: ../../../flutter/third_party/dart/runtime/vm/bytecode_reader.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/bytecode_reader.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/compiler/assembler/disassembler_kbc.cc
@ -4371,6 +4383,10 @@ FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/dart_precompi
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/gen_snapshot_product.plist
 FILE: ../../../flutter/third_party/dart/runtime/tools/entitlements/run_vm_tests.plist
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/pprof/generated/profile.pb.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/pprof/generated/profile.pbenum.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/pprof/generated/profile.pbjson.dart
+FILE: ../../../flutter/third_party/dart/runtime/tools/profiling/lib/src/pprof/generated/profile.pbserver.dart
 FILE: ../../../flutter/third_party/dart/runtime/tools/wiki/styles/style.scss
 FILE: ../../../flutter/third_party/dart/runtime/tools/wiki/templates/includes/auto-refresh.html
 FILE: ../../../flutter/third_party/dart/runtime/tools/wiki/templates/page.html
@ -4787,7 +4803,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
  This Source Code Form is "Incompatible With Secondary Licenses", as
  defined by the Mozilla Public License, v. 2.0.

-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/115a3c609bf22d78d532ea9a9ecbcfb11ca9764f
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2bf0f2b8d39100b37b82fb8b936f2ecad1070af3
 /third_party/fallback_root_certificates/

 ====================================================================================================
--- a/engine/src/flutter/ci/licenses_golden/tool_signature
+++ b/engine/src/flutter/ci/licenses_golden/tool_signature
@ -1,2 +1,2 @@
-Signature: 8859e172e060ecb45aa665c3119d5d25
+Signature: dbe5e49be0f842a35b32e2e3ecfff7a6

--- a/engine/src/flutter/shell/platform/fuchsia/dart/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/dart/BUILD.gn
@ -76,9 +76,13 @@ dart_library("expect") {
  deps = []

  sources = [
+    "async_helper.dart",
    "config.dart",
    "expect.dart",
+    "legacy/async_minitest.dart",
+    "legacy/minitest.dart",
    "minitest.dart",
+    "static_type_helper.dart",
    "variations.dart",
  ]
 }
--- a/engine/src/flutter/sky/packages/sky_engine/LICENSE
+++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE
@ -32054,7 +32054,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
  This Source Code Form is "Incompatible With Secondary Licenses", as
  defined by the Mozilla Public License, v. 2.0.

-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d916a5f69a486de98316900f19ef0ff46834b03d
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2bf0f2b8d39100b37b82fb8b936f2ecad1070af3
 /third_party/fallback_root_certificates/

 --------------------------------------------------------------------------------
--- a/engine/src/flutter/tools/licenses/lib/patterns.dart
+++ b/engine/src/flutter/tools/licenses/lib/patterns.dart
@ -1012,13 +1012,11 @@ final List<RegExp> csTemplateLicenses = <RegExp>[
  // Seen in Mesa, among others.
  RegExp(
    kIndent +
-    (
-      r'(?:' // this bit is optional
-      r'Licensed under the MIT license:\n' // seen in expat
-      r'\1\2? *\n' // blank line
-      r'\1\2' // this is the prefix for the next block (handled by kIndent if this optional bit is skipped)
-      r')?' // end of optional bit
-    )
+    r'(?:' // this bit is optional
+    r'Licensed under the MIT license:\n' // seen in expat
+    r'\1\2? *\n' // blank line
+    r'\1\2' // this is the prefix for the next block (handled by kIndent if this optional bit is skipped)
+    r')?' // end of optional bit
    +
    (
      r'Permission is hereby granted, free of charge, to any person obtaining '
@ -1270,40 +1268,36 @@ final List<RegExp> csTemplateLicenses = <RegExp>[
  // freetype2.
  RegExp(
    kIndent +
-    (
-      r'Permission to use, copy, modify, distribute, and sell this software and its '
-      r'documentation for any purpose is hereby granted without fee, provided that '
-      r'the above copyright notice appear in all copies and that both that '
-      r'copyright notice and this permission notice appear in supporting '
-      r'documentation\. '
-      r'The above copyright notice and this permission notice shall be included in '
-      r'all copies or substantial portions of the Software\. '
-      r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
-      r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
-      r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\.  IN NO EVENT SHALL THE '
-      r'OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN '
-      r'AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
-      r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\. '
-      r'Except as contained in this notice, the name of The Open Group shall not be '
-      r'used in advertising or otherwise to promote the sale, use or other dealings '
-      r'in this Software without prior written authorization from The Open Group\. '
-      .replaceAll(' ', _linebreak)
-    ),
+    r'Permission to use, copy, modify, distribute, and sell this software and its '
+    r'documentation for any purpose is hereby granted without fee, provided that '
+    r'the above copyright notice appear in all copies and that both that '
+    r'copyright notice and this permission notice appear in supporting '
+    r'documentation\. '
+    r'The above copyright notice and this permission notice shall be included in '
+    r'all copies or substantial portions of the Software\. '
+    r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
+    r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
+    r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\.  IN NO EVENT SHALL THE '
+    r'OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN '
+    r'AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
+    r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\. '
+    r'Except as contained in this notice, the name of The Open Group shall not be '
+    r'used in advertising or otherwise to promote the sale, use or other dealings '
+    r'in this Software without prior written authorization from The Open Group\. '
+    .replaceAll(' ', _linebreak),
    multiLine: true,
  ),

  // libjpeg-turbo
  RegExp(
    kIndent +
-    (
-      r'Permission to use, copy, modify, and distribute this software and its '
-      r'documentation for any purpose and without fee is hereby granted, provided '
-      r'that the above copyright notice appear in all copies and that both that '
-      r'copyright notice and this permission notice appear in supporting '
-      r'documentation\. This software is provided "as is" without express or '
-      r'implied warranty\.'
-      .replaceAll(' ', _linebreak)
-    ),
+    r'Permission to use, copy, modify, and distribute this software and its '
+    r'documentation for any purpose and without fee is hereby granted, provided '
+    r'that the above copyright notice appear in all copies and that both that '
+    r'copyright notice and this permission notice appear in supporting '
+    r'documentation\. This software is provided "as is" without express or '
+    r'implied warranty\.'
+    .replaceAll(' ', _linebreak),
    multiLine: true,
  ),
 ];
@ -1357,17 +1351,15 @@ final List<RegExp> csNoticeLicenses = <RegExp>[
  // Freetype
  RegExp(
    kIndent +
-    (
-      r'This software was written by Alexander Peslyak in 2001\. No copyright is '
-      r'claimed, and the software is hereby placed in the public domain\. In case '
-      r'this attempt to disclaim copyright and place the software in the public '
-      r'domain is deemed null and void, then the software is Copyright \(c\) 2001 '
-      r'Alexander Peslyak and it is hereby released to the general public under the '
-      r'following terms: Redistribution and use in source and binary forms, with or '
-      r"without modification, are permitted\. There\'s ABSOLUTELY NO WARRANTY, "
-      r'express or implied\.(?: \(This is a heavily cut-down "BSD license"\.\))?'
-      .replaceAll(' ', _linebreak)
-    ),
+    r'This software was written by Alexander Peslyak in 2001\. No copyright is '
+    r'claimed, and the software is hereby placed in the public domain\. In case '
+    r'this attempt to disclaim copyright and place the software in the public '
+    r'domain is deemed null and void, then the software is Copyright \(c\) 2001 '
+    r'Alexander Peslyak and it is hereby released to the general public under the '
+    r'following terms: Redistribution and use in source and binary forms, with or '
+    r"without modification, are permitted\. There\'s ABSOLUTELY NO WARRANTY, "
+    r'express or implied\.(?: \(This is a heavily cut-down "BSD license"\.\))?'
+    .replaceAll(' ', _linebreak),
    multiLine: true,
  ),

@ -1469,12 +1461,10 @@ final List<RegExp> csNoticeLicenses = <RegExp>[
  // Seen in libjpeg-turbo (with a copyright), zlib.h
  RegExp(
    kIndent +
-    (
-      r" This software is provided 'as-is', without any express or implied "
-      r'warranty\. In no event will the authors be held liable for any damages '
-      r'arising from the use of this software\.'
-      .replaceAll(' ', _linebreak)
-    )
+    r" This software is provided 'as-is', without any express or implied "
+    r'warranty\. In no event will the authors be held liable for any damages '
+    r'arising from the use of this software\.'
+    .replaceAll(' ', _linebreak)
    +
    (
      r' Permission is granted to anyone to use this software for any purpose, '