Merge branch 'main' into pr/hterkelsen/43361

flutter · Jul 12, 2023 · 2da248b · 2da248b
2 parents 97f9c1d + 1b1ccdd
commit 2da248b
Show file tree

Hide file tree

Showing 312 changed files with 3,658 additions and 2,463 deletions.
diff --git a/.github/autosubmit.yml b/.github/autosubmit.yml
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -17,4 +17,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     # Source available at https://github.com/actions/labeler/blob/main/README.md
-    - uses: actions/labeler@0967ca812e7fdc8f5f71402a1b486d5bd061fe20
+    - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594
diff --git a/DEPS b/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': '5eba922297bb306758658b803ff8fc18665ea925',
+  'skia_revision': 'bedc925986447a08b4d723830bae0601e2c732d0',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,26 +53,26 @@ 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': '2d98d9e27daeb80dd6ddb6da94ea9f1a4fe7e5ca',
+  'dart_revision': '8f8f281ccdc670e304c122c77050d9dd31356c1e',
 
   # 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': 'a468ba9fec3f59edf46a7db98caaca893e1e4d96',
   'dart_boringssl_rev': '74646566e93de7551bfdfc5f49de7462f13d1d05',
-  'dart_browser_launcher_rev': '40e431543840cbe7fc05b95a2f851d9f1bd3bc14',
-  'dart_clock_rev': '21caac1cbcea147708fc26989733cd6a486177e7',
-  'dart_collection_rev': 'a37bd51c63b7720799869e3448eafbc19c88bfa6',
+  'dart_browser_launcher_rev': '27ec600af41b0d0ebe9a3db6ad36e9ed11976b84',
+  'dart_clock_rev': '263e508a36ed90e4d85b60dd70552d20e71a9ae9',
+  'dart_collection_rev': 'db343da9fa9653882951c64a05df2eba63a02e21',
   'dart_devtools_rev': '99dca813aaa7fa23ccd6fe3901ac7665e96db3cb',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': 'e76bd74e5c99b47c12b523b49140b637225fc3fc',
+  'dart_protobuf_rev': 'a912f76df9e00d789baccf25b12fcb5d19ac14be',
   'dart_pub_rev': '42819a1e10f803eb7f6296692c5a976e1c647360',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
-  'dart_tools_rev': '8db0aa1e8c418289b9a972529b0f47902c559550',
-  'dart_watcher_rev': '3f17faa2d09dca3e23bc07a01f2045ec0cd2837d',
-  'dart_webdev_rev': '8360d50ff889f3c0f817d4d48d3aebd71345cf5d',
+  'dart_tools_rev': 'af38b2bd26b45353a4ef624ccfd8adfcd6d0f983',
+  'dart_watcher_rev': '7457413060ed7403b90b01533a61bd959932122e',
+  'dart_webdev_rev': '5081dff0952eb7163f98a508d7b2d976c1573c55',
   'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6',
   'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -332,25 +332,25 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9',
 
   'src/third_party/dart/third_party/devtools':
-   {'packages': [{'version': 'git_revision:99dca813aaa7fa23ccd6fe3901ac7665e96db3cb', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:99dca813aaa7fa23ccd6fe3901ac7665e96db3cb'}]},
 
   'src/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@a9543c021f9409832b1668f9256f247585362389',
+   Var('dart_git') + '/args.git@da56b18ebcb600e050bf57b9c1103b1d2a9fb2ff',
 
   'src/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@a506993760a998630113d58d6b18fd19b56033ab',
+   Var('dart_git') + '/async.git@b65622afa33c5bfc574ae6b34d5a61f18a98f83c',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@f7b714ea1437edac65a862f52e95fb4217ed3470',
+   Var('dart_git') + '/bazel_worker.git@c29d1620b1a935dc88d13a4eec0d9950d3e9df27',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@3a1c982002f580b835b4380f44d9f8e5bc37fc4f',
+   Var('dart_git') + '/boolean_selector.git@303635d0262e679fb6a81686724a5dc1dbc850a7',
 
   'src/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@5a499478ff0df4766f89eac7ca2033f2a7a9c7bc',
+   Var('dart_git') + '/cli_util.git@9b7ce784c2889d62be0d6f66022331cb1e53b5b6',
 
   'src/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -359,82 +359,82 @@ deps = {
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
 
   'src/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@9a387f0554381537afc61212c58df3beaabbbce1',
+   Var('dart_git') + '/convert.git@79ee174280149817f9925db0613983aadb46eeca',
 
   'src/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@216931ae7dce946e41adb3904d3b33095dfaf51a',
+   Var('dart_git') + '/crypto.git@8b704c601f4843050624cd334e3b74f6c17315a4',
 
   'src/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@be2e11eedd4b1f12a674fd9246b9f8dd2da9aa5d',
+   Var('dart_git') + '/csslib.git@7e91228c2c2428455e5bc63bbf89c7bf0f3401b0',
 
   'src/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@e04a6b309a28498e9221ea45c878beae2aaa7dac',
+   Var('dart_git') + '/dartdoc.git@2522559623bdbaf471d09b3c9d77bd378d70d6d2',
 
   'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@f582ca022042323af061f35ccd24b6c4d38f7bd1',
+   Var('dart_git') + '/ffi.git@f01dfca0b3c9a63155bfb86aae12be982571a860',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@5d9a6027756b5846e8f5380f983390f61f564a75',
 
   'src/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@d9b9a2a288d5eb467fb1597e80beb063b05cd4f6',
+   Var('dart_git') + '/fixnum.git@00fa1207768bd07d04c895cbe0f1fe99af14e727',
 
   'src/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@109121d9993c1ef8d078e185160a9d477c82defd',
+   Var('dart_git') + '/glob.git@5b243935154daf53c54981b98f625bace90b2112',
 
   'src/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@b3b820bc36ed17673268360d8b569bdc66c22123',
+   Var('dart_git') + '/html.git@4060496b0443451c38f8b789db2e44c0d7966171',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@ff1fcfe5d77ea09b82a0aff0d796018504aef59b',
+   Var('dart_git') + '/http.git@c148a3acbef72a4a507be46c0e62894c616e8702',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@a209cd59d99b52ff08b32ba37bdc9fc1a79bc9f2',
+   Var('dart_git') + '/http_multi_server.git@aa128cfaf6ef1c9c1ace962ca2dcf6e5dddad441',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@19466c0daf9138ab20877f34dbcf4479b31d33d6',
+   Var('dart_git') + '/http_parser.git@c14fbf6aa7ada5e8912eab4581eb26ff4d101452',
 
   'src/third_party/dart/third_party/pkg/intl':
    Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
 
   'src/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@73467f3651669af4870260fea4e99d7ba6ccb7ec',
+   Var('dart_git') + '/json_rpc_2.git@509f71eef90ec5afb5486b69dab7fed97b9f1eef',
 
   'src/third_party/dart/third_party/pkg/leak_tracker':
-   Var('dart_git') + '/leak_tracker.git@c75b0a71bb1b92abf2c692459a7cb2df5f2af083',
+   Var('dart_git') + '/leak_tracker.git@85bd7fb23bfdfdcc66390e8d6ae81aafd65fe51e',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@770c3c5858a112cdb9e8d65e11ba659322700c68',
+   Var('dart_git') + '/linter.git@655de5d0dc30cdd1df9ce4cd16bd7489106d987f',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@f2fe2ac2a61a269b2e0ce65be330f7af1bc67428',
+   Var('dart_git') + '/logging.git@521498757ed3eeae151c2d4796404e8947baa04c',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@bd6ae8d741327e24319f3e036d57107f91229843',
+   Var('dart_git') + '/markdown.git@b4bdde2eb7de89d94e69f3bad37faba5ba95aaad',
 
   'src/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@7e1011772566a8d1817c725a71f091e2791721c8',
+   Var('dart_git') + '/matcher.git@ce8f40934c90e12992071172795b3bca29fac295',
 
   'src/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@24448401f621b9e154d165c900a3c8decd8a23f4',
+   Var('dart_git') + '/mime.git@bdb66bdd354156280bddc30e2d322a4ad355f671',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@1d6064adf043d1fce013d2d205a3fdc655c90043',
+   Var('dart_git') + '/mockito.git@451f756fe12a32d2a943db80124b522ecbd557af',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@e12d3e6ebe7ec3143566e9f1d48876a762602e24',
+   Var('dart_git') + '/native.git@1e89ed99e344fde0226ff472d290dd9fd0998d16',
 
   'src/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@203de2022af26b3ab2bcec18cc49614d9e502897',
+   Var('dart_git') + '/package_config.git@be0c4411cb7607abe3fd531c9653b0ba53c87c0f',
 
   'src/third_party/dart/third_party/pkg/path':
-   Var('dart_git') + '/path.git@592505f67d0563f72c933c2ba100ea7d4f3cb873',
+   Var('dart_git') + '/path.git@282dd18bd9ae2e265ea40a29b2c637194e9be8b7',
 
   'src/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@c6b1b2c22663c084a82c9bfe409c196fb38eea53',
+   Var('dart_git') + '/pool.git@77001024a16126cc5718e654ea3e57bbf6e7fac3',
 
   'src/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -443,55 +443,55 @@ 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@3930557ee0b20ef528713952c318139409edadb4',
+   Var('dart_git') + '/pub_semver.git@028b43506a3f7ec7f7b4673a78ba3da3d5fb138d',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@ce379aa3c22024edb2df3657fd564f1f463406e6',
+   Var('dart_git') + '/shelf.git@bd59ead508e55b1db354ab53d666715595b5bd79',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
-   Var('dart_git') + '/source_map_stack_trace.git@b83af01938225c1706bbc6c1f86bd4a394f91380',
+   Var('dart_git') + '/source_map_stack_trace.git@16e54fd9fc088961773340cb5c3688a089387135',
 
   'src/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@58eef30d9c3d2b160faec5c6510ef915f11f83fd',
+   Var('dart_git') + '/source_maps.git@97c4833100b1bd8ea7e4a2fa1808383007e2d1e8',
 
   'src/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@4dc78fb33d37153a3ac55aee201a9a7b62c40ce7',
+   Var('dart_git') + '/source_span.git@37735aecc5d8c0fb75ed61691bae056510b357bb',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@bfcbcd7a7320c74dfee154152419381c508a1fad',
+   Var('dart_git') + '/sse.git@e24108561ec359a6f67c26e27e9f4ad7b8208180',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@8b2046ecac56f5bb9196033ed187da0cf73eac67',
+   Var('dart_git') + '/stack_trace.git@4ddd86d5d22aad9a8e8e9a06fd0a6a6271736135',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@34804a13bfa3112faecddfcd6a5a4f2b6e184aa4',
+   Var('dart_git') + '/stream_channel.git@e54234f94da929153b012de2bba75c5246a52538',
 
   'src/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@6bb314f2176598a5ecc4770a3bbd42626e18b576',
+   Var('dart_git') + '/string_scanner.git@35657e2ae381612468aa2c432e89d7357c0b568c',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@4daa34eea4bd6d9780aaeadbf6665af3ebb402fd',
+   Var('dart_git') + '/term_glyph.git@423700a3c019dc67f93d2bd6578016a1402506f7',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@cdc8178b885e80930d5141ff48daae3af5525ba7',
+   Var('dart_git') + '/test.git@3429712b44b9c6222437312601044c44dc6f5e4e',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@40d61b16647cd61b02d806fea46362ef07e7c502',
+   Var('dart_git') + '/test_reflective_loader.git@0bfaad91ed308ce9da11b48395c8210d7542c16b',
 
   'src/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
   'src/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@8d29573ab6fd26a272dc846255eda66a01abae01',
+   Var('dart_git') + '/typed_data.git@a20be901e11eddcbd6e5735fb01b64d28c94c49d',
 
   'src/third_party/dart/third_party/pkg/usage':
-   Var('dart_git') + '/usage.git@6ee09084596f9829371bb836f9d1ca05820f29ea',
+   Var('dart_git') + '/usage.git@09bb8472fdafff2c48a19aabbcf57b3af0f43934',
 
   '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@7fb82f2f542400f8ba49546552d6f272fc554694',
+   Var('dart_git') + '/web_socket_channel.git@7ae4d0f31f700747bfe9fbfc0b7ec860d46f7755',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -500,13 +500,13 @@ 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@0b9041de94b00bc54e8d38daecfe9075b5623996',
+   Var('dart_git') + '/yaml.git@7930148a3d03d7985ce2b53bc5eb2be9c878dab8',
 
   'src/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/third_party/dart/tools/sdks/dart-sdk':
-   {'packages': [{'version': 'version:3.1.0-155.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.1.0-155.0.dev'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -889,7 +889,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'MPy31yjgPV-d_YJq0flrP6oOibi_1do-LGtXh4cHOqEC'
+        'version': '0fvk838jTDNQ_l43kj5Vz-3ZA1JntonkaLZ8UJxQSaUC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -899,7 +899,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'Cfxhimvf7nMO99ky_58fDRvaiZ6Q6175h0Uet70Um30C'
+        'version': '1STsUj0X5YgpiSNEbqRCus0XRGJ-uLoTCxmjIVMy_EoC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

diff --git a/ci/builders/linux_unopt.json b/ci/builders/linux_unopt.json
@@ -3,7 +3,8 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Linux"
+                "os=Linux",
+                "cores=32"
             ],
             "gn": [
                 "--runtime-mode",

diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
@@ -74,7 +74,6 @@
 ../../../flutter/flow/layers/transform_layer_unittests.cc
 ../../../flutter/flow/mutators_stack_unittests.cc
 ../../../flutter/flow/raster_cache_unittests.cc
-../../../flutter/flow/rtree_unittests.cc
 ../../../flutter/flow/skia_gpu_object_unittests.cc
 ../../../flutter/flow/surface_frame_unittests.cc
 ../../../flutter/flow/testing
@@ -212,7 +211,6 @@
 ../../../flutter/runtime/no_dart_plugin_registrant_unittests.cc
 ../../../flutter/runtime/type_conversions_unittests.cc
 ../../../flutter/shell/common/animator_unittests.cc
-../../../flutter/shell/common/canvas_spy_unittests.cc
 ../../../flutter/shell/common/context_options_unittests.cc
 ../../../flutter/shell/common/dl_op_spy_unittests.cc
 ../../../flutter/shell/common/engine_unittests.cc
@@ -282,6 +280,7 @@
 ../../../flutter/shell/platform/fuchsia/dart_runner/.gitignore
 ../../../flutter/shell/platform/fuchsia/dart_runner/README.md
 ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/dart_runner/fidl/meta.json
 ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json
 ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml
 ../../../flutter/shell/platform/fuchsia/dart_runner/tests
@@ -291,6 +290,7 @@
 ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/build/asset_package.py
 ../../../flutter/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
+../../../flutter/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/component_v2_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc
@@ -302,6 +302,7 @@
 ../../../flutter/shell/platform/fuchsia/flutter/platform_view_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/rtree_unittests.cc
 ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_missing_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc
 ../../../flutter/shell/platform/fuchsia/flutter/tests
@@ -450,8 +451,6 @@
 ../../../fuchsia/sdk/linux/arch/x64/sysroot/dist/lib/ld.so.1
 ../../../fuchsia/sdk/linux/dart/fidl/meta.json
 ../../../fuchsia/sdk/linux/dart/fuchsia/meta.json
-../../../fuchsia/sdk/linux/dart/fuchsia_services/meta.json
-../../../fuchsia/sdk/linux/dart/fuchsia_vfs/meta.json
 ../../../fuchsia/sdk/linux/dart/sl4f/meta.json
 ../../../fuchsia/sdk/linux/dart/zircon/meta.json
 ../../../fuchsia/sdk/linux/data/config/symbol_index/meta.json