[experimental] Update experimental to main
Merge remote-tracking branch 'origin/main' into experimental
Change-Id: If3c1d9a8adfb8138d91783ab8bc1153fa3f5ddfb
Reviewed-on: https://dart-review.googlesource.com/c/monorepo/+/309320
Reviewed-by: Alexander Thomas <athom@google.com>
diff --git a/DEPS b/DEPS
index 1ea3614..21063c9 100644
--- a/DEPS
+++ b/DEPS
@@ -18,11 +18,11 @@
'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': '8cd227c75580aa2d92188055b372692dbb00f546',
+ 'skia_revision': '6d5dc31d88e2da6f10bc484bd686bc5112a3c356',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
- 'canvaskit_cipd_instance': 'yrsfF-vTvu4jzBBm1o6tDl70dky-l4G29Dnj75UvRDgC',
+ 'canvaskit_cipd_instance': '61aeJQ9laGfEFF_Vlc_u0MCkqB6xb2hAYHRBxKH-Uw4C',
# Do not download the Emscripten SDK by default.
# This prevents us from downloading the Emscripten toolchain for builds
@@ -30,31 +30,53 @@
# for the web engine.
'download_emsdk': False,
+ # For experimental features some dependencies may only be avaialable in the master/main
+ # channels. This variable is being set when CI is checking out the repository.
+ 'release_candidate': False,
+
+ # As Dart does, we use Fuchsia's GN and Clang toolchain. These revision
+ # should be kept up to date with the revisions pulled by Dart.
+ # The list of revisions for these tools comes from Fuchsia, here:
+ # https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
+ # If there are problems with the toolchain, contact fuchsia-toolchain@.
+ 'clang_version': 'git_revision:7f374b6902fad9caed41284a57d573abe9ada9d1',
+
+ # The goma version and the clang version can be tightly coupled. If goma
+ # stops working on a clang roll, this may need to be updated using the value
+ # from the 'integration' tag of
+ # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/goma/client
+ 'goma_version': ' git_revision:41b3bcb64014144a844153fd5588c36411fffb56',
+
# The dart_revision variable is not used in monorepo.
# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
# Dart SDK's DEPS file for that revision of Dart. The DEPS file for
- # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
+ # 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': 'unused',
# 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_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
- 'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
- 'dart_browser_launcher_rev': '981ca8847dd2b0fe022f9e742045cfb8f214d35f',
- 'dart_clock_rev': '2507a228773c5e877fc9e3330080b234aad965c0',
- 'dart_collection_rev': '414ffa1bc8ba18bd608bbf916d95715311d89ac1',
- 'dart_devtools_rev': 'd131d19091f6b89ac89486bd92440a25a523e8b0',
- 'dart_protobuf_rev': '19c4eb63e05e7a87c61a98ecca868fff904b589c',
- 'dart_pub_rev': 'ec35d46261b610e558dfd0d8525ca3fc8387b4b7',
+ '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_devtools_rev': '0c0c65dbaf53f8c508bfd6acbeb7f1986c1ca1f8',
+ 'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
+ 'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
+ 'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
+ 'dart_protobuf_rev': 'edf8e923c3ba6d94bc24066f677356debf9cc031',
+ 'dart_pub_rev': '078c7fea0be2656debc675646806da14fa94f853',
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
- 'dart_watcher_rev': 'e00c0ea769e32821d91c0880da8eb736839a6e6d',
- 'dart_webdev_rev': '605b981abe95221d2bd10c069669e4f751e55c5d',
- 'dart_webkit_inspection_protocol_rev': '57ebca4b97310a10774c59c0fb056d8f23bd5cee',
- 'dart_yaml_edit_rev': '01589b3ce447b03aed991db49f1ec6445ad5476d',
- 'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
+ 'dart_tools_rev': '8d6e8b82e3eef8b2f5e3ec9bdd3dd1a2ad3e13f5',
+ 'dart_watcher_rev': '3f17faa2d09dca3e23bc07a01f2045ec0cd2837d',
+ 'dart_webdev_rev': '81ae77aab6c289175583d81869e558427676028a',
+ 'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6',
+ 'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce',
+ 'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -84,7 +106,136 @@
"checkout_llvm": False,
# Setup Git hooks by default.
- "setup_githooks": True,
+ 'setup_githooks': True,
+
+ # When this is true, the goma client will be downloaded from cipd, and
+ # the engine build will prefer to use this client over a client that is
+ # specified by GOMA_DIR, or installed in the default goma install location.
+ 'use_cipd_goma': False,
+
+ # This is not downloaded be default because it increases the
+ # `gclient sync` time by between 1 and 3 minutes. This option is enabled
+ # in flutter/ci/builders/mac_impeller_cmake_example.json, and is likely to
+ # only be useful locally when reproducing issues found by the bot.
+ 'download_impeller_cmake_example': False,
+
+ # Upstream URLs for third party dependencies, used in
+ # determining common ancestor commit for vulnerability scanning
+ # prefixed with 'upstream_' in order to be identified by parsing tool.
+ # The vulnerabiity database being used in this scan can be browsed
+ # using this UI https://osv.dev/list
+ # If a new dependency needs to be added, the upstream (non-mirrored)
+ # git URL for that dependency should be added to this list
+ # with the key-value pair being:
+ # 'upstream_[dep name from last slash and before .git in URL]':'[git URL]'
+ # example:
+ "upstream_abseil-cpp": "https://github.com/abseil/abseil-cpp.git",
+ "upstream_angle": "https://github.com/google/angle.git",
+ "upstream_archive": "https://github.com/brendan-duncan/archive.git",
+ "upstream_args": "https://github.com/dart-lang/args.git",
+ "upstream_async": "https://github.com/dart-lang/async.git",
+ "upstream_bazel_worker": "https://github.com/dart-lang/bazel_worker.git",
+ "upstream_benchmark": "https://github.com/google/benchmark.git",
+ "upstream_boolean_selector": "https://github.com/dart-lang/boolean_selector.git",
+ "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git",
+ "upstream_boringssl": "https://github.com/openssl/openssl.git",
+ "upstream_browser_launcher": "https://github.com/dart-lang/browser_launcher.git",
+ "upstream_buildroot": "https://github.com/flutter/buildroot.git",
+ "upstream_cli_util": "https://github.com/dart-lang/cli_util.git",
+ "upstream_clock": "https://github.com/dart-lang/clock.git",
+ "upstream_collection": "https://github.com/dart-lang/collection.git",
+ "upstream_colorama": "https://github.com/tartley/colorama.git",
+ "upstream_convert": "https://github.com/dart-lang/convert.git",
+ "upstream_crypto": "https://github.com/dart-lang/crypto.git",
+ "upstream_csslib": "https://github.com/dart-lang/csslib.git",
+ "upstream_dart_style": "https://github.com/dart-lang/dart_style.git",
+ "upstream_dartdoc": "https://github.com/dart-lang/dartdoc.git",
+ "upstream_equatable": "https://github.com/felangel/equatable.git",
+ "upstream_ffi": "https://github.com/dart-lang/ffi.git",
+ "upstream_file": "https://github.com/google/file.dart.git",
+ "upstream_fixnum": "https://github.com/dart-lang/fixnum.git",
+ "upstream_flatbuffers": "https://github.com/google/flatbuffers.git",
+ "upstream_fontconfig": "https://gitlab.freedesktop.org/fontconfig/fontconfig.git",
+ "upstream_freetype2": "https://gitlab.freedesktop.org/freetype/freetype.git",
+ "upstream_gcloud": "https://github.com/dart-lang/gcloud.git",
+ "upstream_glfw": "https://github.com/glfw/glfw.git",
+ "upstream_glob": "https://github.com/dart-lang/glob.git",
+ "upstream_googleapis": "https://github.com/google/googleapis.dart.git",
+ "upstream_googletest": "https://github.com/google/googletest.git",
+ "upstream_gtest-parallel": "https://github.com/google/gtest-parallel.git",
+ "upstream_harfbuzz": "https://github.com/harfbuzz/harfbuzz.git",
+ "upstream_html": "https://github.com/dart-lang/html.git",
+ "upstream_http_multi_server": "https://github.com/dart-lang/http_multi_server.git",
+ "upstream_http_parser": "https://github.com/dart-lang/http_parser.git",
+ "upstream_http": "https://github.com/dart-lang/http.git",
+ "upstream_icu": "https://github.com/unicode-org/icu.git",
+ "upstream_intl": "https://github.com/dart-lang/intl.git",
+ "upstream_imgui": "https://github.com/ocornut/imgui.git",
+ "upstream_inja": "https://github.com/pantor/inja.git",
+ "upstream_json": "https://github.com/nlohmann/json.git",
+ "upstream_json_rpc_2": "https://github.com/dart-lang/json_rpc_2.git",
+ "upstream_libcxx": "https://github.com/llvm-mirror/libcxx.git",
+ "upstream_libcxxabi": "https://github.com/llvm-mirror/libcxxabi.git",
+ "upstream_libexpat": "https://github.com/libexpat/libexpat.git",
+ "upstream_libjpeg-turbo": "https://github.com/libjpeg-turbo/libjpeg-turbo.git",
+ "upstream_libpng": "https://github.com/glennrp/libpng.git",
+ "upstream_libtess2": "https://github.com/memononen/libtess2.git",
+ "upstream_libwebp": "https://chromium.googlesource.com/webm/libwebp.git",
+ "upstream_libxml": "https://gitlab.gnome.org/GNOME/libxml2.git",
+ "upstream_leak_tracker": "https://github.com/dart-lang/leak_tracker.git",
+ "upstream_linter": "https://github.com/dart-lang/linter.git",
+ "upstream_logging": "https://github.com/dart-lang/logging.git",
+ "upstream_markdown": "https://github.com/dart-lang/markdown.git",
+ "upstream_matcher": "https://github.com/dart-lang/matcher.git",
+ "upstream_mime": "https://github.com/dart-lang/mime.git",
+ "upstream_mockito": "https://github.com/dart-lang/mockito.git",
+ "upstream_oauth2": "https://github.com/dart-lang/oauth2.git",
+ "upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
+ "upstream_package_config": "https://github.com/dart-lang/package_config.git",
+ "upstream_packages": "https://github.com/flutter/packages.git",
+ "upstream_path": "https://github.com/dart-lang/path.git",
+ "upstream_platform": "https://github.com/google/platform.dart.git",
+ "upstream_pool": "https://github.com/dart-lang/pool.git",
+ "upstream_process_runner": "https://github.com/google/process_runner.git",
+ "upstream_process": "https://github.com/google/process.dart.git",
+ "upstream_protobuf": "https://github.com/google/protobuf.dart.git",
+ "upstream_pub_semver": "https://github.com/dart-lang/pub_semver.git",
+ "upstream_pub": "https://github.com/dart-lang/pub.git",
+ "upstream_pyyaml": "https://github.com/yaml/pyyaml.git",
+ "upstream_quiver-dart": "https://github.com/google/quiver-dart.git",
+ "upstream_rapidjson": "https://github.com/Tencent/rapidjson.git",
+ "upstream_root_certificates": "https://github.com/dart-lang/root_certificates.git",
+ "upstream_sdk": "https://github.com/dart-lang/sdk.git",
+ "upstream_shaderc": "https://github.com/google/shaderc.git",
+ "upstream_shelf": "https://github.com/dart-lang/shelf.git",
+ "upstream_skia": "https://skia.googlesource.com/skia.git",
+ "upstream_source_map_stack_trace": "https://github.com/dart-lang/source_map_stack_trace.git",
+ "upstream_source_maps": "https://github.com/dart-lang/source_maps.git",
+ "upstream_source_span": "https://github.com/dart-lang/source_span.git",
+ "upstream_sqlite": "https://github.com/sqlite/sqlite.git",
+ "upstream_sse": "https://github.com/dart-lang/sse.git",
+ "upstream_stack_trace": "https://github.com/dart-lang/stack_trace.git",
+ "upstream_stream_channel": "https://github.com/dart-lang/stream_channel.git",
+ "upstream_string_scanner": "https://github.com/dart-lang/string_scanner.git",
+ "upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
+ "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",
+ "upstream_Vulkan-Headers": "https://github.com/KhronosGroup/Vulkan-Headers.git",
+ "upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
+ "upstream_watcher": "https://github.com/dart-lang/watcher.git",
+ "upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git",
+ "upstream_webdev": "https://github.com/dart-lang/webdev.git",
+ "upstream_webkit_inspection_protocol": "https://github.com/google/webkit_inspection_protocol.dart.git",
+ "upstream_wuffs-mirror-release-c": "https://github.com/google/wuffs-mirror-release-c.git",
+ "upstream_yaml_edit": "https://github.com/dart-lang/yaml_edit.git",
+ "upstream_yaml": "https://github.com/dart-lang/yaml.git",
+ "upstream_yapf": "https://github.com/google/yapf.git",
+ "upstream_zlib": "https://github.com/madler/zlib.git",
}
gclient_gn_args_file = 'engine/src/third_party/dart/build/config/gclient_args.gni'
@@ -95,33 +246,37 @@
# Only these hosts are allowed for dependencies in this DEPS file.
# If you need to add a new host, contact chrome infrastructure team.
allowed_hosts = [
+ 'boringssl.googlesource.com',
+ 'chrome-infra-packages.appspot.com',
'chromium.googlesource.com',
+ 'dart.googlesource.com',
'flutter.googlesource.com',
'fuchsia.googlesource.com',
- 'github.com',
+ 'llvm.googlesource.com',
'skia.googlesource.com',
+ 'swiftshader.googlesource.com',
]
deps = {
- 'engine/src': 'https://github.com/flutter/buildroot.git' + '@' + '25e5fd0200ff0bbf4761f3e73cab67a16e928955',
+ 'engine/src': 'https://github.com/flutter/buildroot.git' + '@' + 'fabb92f0ada787444ad0be22638c80a6d5927a2c',
- 'engine/src/flutter': Var('flutter_git') + '/mirrors/engine' + '@' + '52e213ebbd97a2166272a83b13736ffbfdb1d6ae',
+ 'engine/src/flutter': Var('flutter_git') + '/mirrors/engine' + '@' + 'ac954eefda9937e2bacb1143238e2f6b91d1fa8e',
- 'engine/src/third_party/dart': Var('dart_git') + '/sdk' + '@' + 'e6caafcc3a6cbf59608c506ba450abb109141636',
+ 'engine/src/third_party/dart': Var('dart_git') + '/sdk' + '@' + 'e5a68252e32ac3092b401d5afc0f59b2847e0ced',
- 'flutter': Var('flutter_git') + '/mirrors/flutter' + '@' + '5848306e3784d0a8fe88f29d63f8749151a2677d',
+ 'flutter': Var('flutter_git') + '/mirrors/flutter' + '@' + '40bb615b0c96b2ca2ec2777fe9ea6aa20c815b14',
# Fuchsia compatibility
#
# The dependencies in this section should match the layout in the Fuchsia gn
# build. Eventually, we'll manage these dependencies together with Fuchsia
- # and not have to specific specific hashes.
+ # and not have to specific hashes.
'engine/src/third_party/rapidjson':
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
'engine/src/third_party/harfbuzz':
- Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'd40d15e994ed60d32bcfc9ab87004dfb028dfbd6',
+ Var('flutter_git') + '/third_party/harfbuzz' + '@' + '5f0431572e143056410fbf6b8865be5a78befbdc',
'engine/src/third_party/libcxx':
Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',
@@ -130,19 +285,19 @@
Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
'engine/src/third_party/glfw':
- Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',
+ Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
'engine/src/third_party/shaderc':
- Var('github_git') + '/google/shaderc.git' + '@' + '948660cccfbbc303d2590c7f44a4cee40b66fdd6',
+ Var('github_git') + '/google/shaderc.git' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543',
'engine/src/third_party/vulkan-deps':
- Var('chromium_git') + '/vulkan-deps' + '@' + '23b710f1a0b3c44d51035c6400a554415f95d9c6',
+ Var('chromium_git') + '/vulkan-deps' + '@' + '40b75117a60b11c42a1fb87bf14c0f49bcdb8b3d',
'engine/src/third_party/flatbuffers':
Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
'engine/src/third_party/icu':
- Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '12de966fcbe1d1a48dba310aee63807856ffeee8',
+ Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a2961dc659b4ae847a9c6120718cc2517ee57d9e',
'engine/src/third_party/khronos':
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '676d544d2b8f48903b7da9fceffaa534a5613978',
@@ -165,29 +320,42 @@
'engine/src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
+ 'engine/src/third_party/perfetto':
+ Var('fuchsia_git') + "/third_party/android.googlesource.com/platform/external/perfetto"
+ + '@' + Var('dart_perfetto_rev'),
+
+ 'engine/src/third_party/protobuf':
+ Var('fuchsia_git') + '/third_party/protobuf' + '@' + Var('dart_libprotobuf_rev'),
+
+ 'engine/src/build/secondary/third_party/protobuf':
+ Var('fuchsia_git') + '/protobuf-gn' + '@' + Var('dart_protobuf_gn_rev'),
+
# WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
+ 'engine/src/third_party/dart/third_party/binaryen/src':
+ Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9',
+
'engine/src/third_party/dart/third_party/devtools':
- {'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:d131d19091f6b89ac89486bd92440a25a523e8b0'}], 'dep_type': 'cipd'},
+ {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:0c0c65dbaf53f8c508bfd6acbeb7f1986c1ca1f8'}]},
'engine/src/third_party/dart/third_party/pkg/args':
- Var('dart_git') + '/args.git@80d4abbd6b38b79bcdbc411b4b517628c7611232',
+ Var('dart_git') + '/args.git@a9543c021f9409832b1668f9256f247585362389',
'engine/src/third_party/dart/third_party/pkg/async':
- Var('dart_git') + '/async.git@f3ed5f690e2ec9dbe1bfc5184705575b4f6480e5',
+ Var('dart_git') + '/async.git@a506993760a998630113d58d6b18fd19b56033ab',
'engine/src/third_party/dart/third_party/pkg/bazel_worker':
- Var('dart_git') + '/bazel_worker.git@9710de6c9c70b1b583183db9d9721ba64e5a16fe',
+ Var('dart_git') + '/bazel_worker.git@c14a2687728081adc14c12fa50165e785326275c',
'engine/src/third_party/dart/third_party/pkg/boolean_selector':
- Var('dart_git') + '/boolean_selector.git@1d3565e2651d16566bb556955b96ea75018cbd0c',
+ Var('dart_git') + '/boolean_selector.git@3a1c982002f580b835b4380f44d9f8e5bc37fc4f',
'engine/src/third_party/dart/third_party/pkg/browser_launcher':
Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
'engine/src/third_party/dart/third_party/pkg/cli_util':
- Var('dart_git') + '/cli_util.git@b0adbba89442b2ea6fef39c7a82fe79cb31e1168',
+ Var('dart_git') + '/cli_util.git@5a499478ff0df4766f89eac7ca2033f2a7a9c7bc',
'engine/src/third_party/dart/third_party/pkg/clock':
Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -196,76 +364,82 @@
Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
'engine/src/third_party/dart/third_party/pkg/convert':
- Var('dart_git') + '/convert.git@7145da14f9cd730e80fb4c6a10108fcfd205e8e7',
+ Var('dart_git') + '/convert.git@9a387f0554381537afc61212c58df3beaabbbce1',
'engine/src/third_party/dart/third_party/pkg/crypto':
- Var('dart_git') + '/crypto.git@7cf89d35b3d90786d9f7f75211b3b3cd7e4d173f',
+ Var('dart_git') + '/crypto.git@216931ae7dce946e41adb3904d3b33095dfaf51a',
'engine/src/third_party/dart/third_party/pkg/csslib':
- Var('dart_git') + '/csslib.git@ba2eb2d80530eedefadaade338a09c2dd60410f3',
+ Var('dart_git') + '/csslib.git@be2e11eedd4b1f12a674fd9246b9f8dd2da9aa5d',
'engine/src/third_party/dart/third_party/pkg/dart_style':
- Var('dart_git') + '/dart_style.git@49bc3ff32b5578b6e19f8fd376d668130941ee29',
+ Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
'engine/src/third_party/dart/third_party/pkg/dartdoc':
- Var('dart_git') + '/dartdoc.git@63e2f2bd0816223cf886609bbeef5f49d2a16a1f',
+ Var('dart_git') + '/dartdoc.git@57994242382fa71f4dd6f9ad5d3cffe82e5276c2',
'engine/src/third_party/dart/third_party/pkg/ffi':
- Var('dart_git') + '/ffi.git@fb5f2667826c0900e551d19101052f84e35f41bf',
+ Var('dart_git') + '/ffi.git@f582ca022042323af061f35ccd24b6c4d38f7bd1',
'engine/src/third_party/dart/third_party/pkg/file':
- Var('dart_git') + '/external/github.com/google/file.dart@b2e31cb6ef40b223701dbfa0b907fe58468484d7',
+ Var('dart_git') + '/external/github.com/google/file.dart@5d9a6027756b5846e8f5380f983390f61f564a75',
'engine/src/third_party/dart/third_party/pkg/fixnum':
- Var('dart_git') + '/fixnum.git@e0b17cc1f639c55a9c24947392c64b5a68992535',
+ Var('dart_git') + '/fixnum.git@d9b9a2a288d5eb467fb1597e80beb063b05cd4f6',
'engine/src/third_party/dart/third_party/pkg/glob':
- Var('dart_git') + '/glob.git@1d51fcc172e5adfbae6e82c3f8f119774cb2fca2',
+ Var('dart_git') + '/glob.git@109121d9993c1ef8d078e185160a9d477c82defd',
'engine/src/third_party/dart/third_party/pkg/html':
- Var('dart_git') + '/html.git@8243e967caad9932c13971af3b2a7c8f028383d5',
+ Var('dart_git') + '/html.git@b3b820bc36ed17673268360d8b569bdc66c22123',
'engine/src/third_party/dart/third_party/pkg/http':
- Var('dart_git') + '/http.git@c7ee0ef0a8bd3488ce88698148df8a8778d78529',
+ Var('dart_git') + '/http.git@ba7eb6023c89ffc5cbfe15a6cba2f8006e6f6dac',
'engine/src/third_party/dart/third_party/pkg/http_multi_server':
- Var('dart_git') + '/http_multi_server.git@20bf079c8955d1250a45afb9cb096472a724a551',
+ Var('dart_git') + '/http_multi_server.git@a209cd59d99b52ff08b32ba37bdc9fc1a79bc9f2',
'engine/src/third_party/dart/third_party/pkg/http_parser':
- Var('dart_git') + '/http_parser.git@b968f7ddde0588273a6cbd1d2eb6569f418606ac',
+ Var('dart_git') + '/http_parser.git@19466c0daf9138ab20877f34dbcf4479b31d33d6',
+
+ 'engine/src/third_party/dart/third_party/pkg/intl':
+ Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
'engine/src/third_party/dart/third_party/pkg/json_rpc_2':
- Var('dart_git') + '/json_rpc_2.git@805e6536dd961d66f6b8cd46d8f3e61774f957c9',
+ Var('dart_git') + '/json_rpc_2.git@73467f3651669af4870260fea4e99d7ba6ccb7ec',
+
+ 'engine/src/third_party/dart/third_party/pkg/leak_tracker':
+ Var('dart_git') + '/leak_tracker.git@f17da619a987aec1b89b0e29ec198a5e3361fea1',
'engine/src/third_party/dart/third_party/pkg/linter':
- Var('dart_git') + '/linter.git@304042aaa933a02d2581ab9598dd2ddaebdbc803',
+ Var('dart_git') + '/linter.git@27b46ce246204a2c0170a4bd5b23b94095e89a22',
'engine/src/third_party/dart/third_party/pkg/logging':
- Var('dart_git') + '/logging.git@d10e24844c2e01d3f6d2b5a1a2bb8717359c6a87',
+ Var('dart_git') + '/logging.git@f2fe2ac2a61a269b2e0ce65be330f7af1bc67428',
'engine/src/third_party/dart/third_party/pkg/markdown':
- Var('dart_git') + '/markdown.git@e3f4bd28c9e61b522f75f291d4d6cfcfeccd83ee',
+ Var('dart_git') + '/markdown.git@bd6ae8d741327e24319f3e036d57107f91229843',
'engine/src/third_party/dart/third_party/pkg/matcher':
- Var('dart_git') + '/matcher.git@cba63ebf8ed1daeffd5f3c55fd30085152c4512d',
+ Var('dart_git') + '/matcher.git@7e1011772566a8d1817c725a71f091e2791721c8',
'engine/src/third_party/dart/third_party/pkg/mime':
- Var('dart_git') + '/mime.git@0a75a41445eb642674a0a271eecde78cb025ee60',
+ Var('dart_git') + '/mime.git@24448401f621b9e154d165c900a3c8decd8a23f4',
'engine/src/third_party/dart/third_party/pkg/mockito':
- Var('dart_git') + '/mockito.git@2acf22f4d400c6e1eee0f6ca595092220fba8b34',
+ Var('dart_git') + '/mockito.git@1d6064adf043d1fce013d2d205a3fdc655c90043',
- 'engine/src/third_party/dart/third_party/pkg/oauth2':
- Var('dart_git') + '/oauth2.git@199ebf15cbd5b07958438184f32e41c4447a57bf',
+ 'engine/src/third_party/dart/third_party/pkg/native':
+ Var('dart_git') + '/native.git@2de88135e25577d851c95b04af0ceb74b706f285',
'engine/src/third_party/dart/third_party/pkg/package_config':
- Var('dart_git') + '/package_config.git@cff98c90acc457a3b0750f0a7da0e351a35e5d0c',
+ Var('dart_git') + '/package_config.git@203de2022af26b3ab2bcec18cc49614d9e502897',
'engine/src/third_party/dart/third_party/pkg/path':
- Var('dart_git') + '/path.git@9955b27b9bb98d87591208e19eb01c51d29fd467',
+ Var('dart_git') + '/path.git@592505f67d0563f72c933c2ba100ea7d4f3cb873',
'engine/src/third_party/dart/third_party/pkg/pool':
- Var('dart_git') + '/pool.git@fa84ddd0e39f45bf3f09dcc5d6b9fbdda7820fef',
+ Var('dart_git') + '/pool.git@c6b1b2c22663c084a82c9bfe409c196fb38eea53',
'engine/src/third_party/dart/third_party/pkg/protobuf':
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -274,52 +448,55 @@
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
'engine/src/third_party/dart/third_party/pkg/pub_semver':
- Var('dart_git') + '/pub_semver.git@9fd28757ba45961ac5449e0f2b0020670e921475',
+ Var('dart_git') + '/pub_semver.git@3930557ee0b20ef528713952c318139409edadb4',
'engine/src/third_party/dart/third_party/pkg/shelf':
- Var('dart_git') + '/shelf.git@0965d864d0e6c66d5bb6daece400e80484640bd5',
+ Var('dart_git') + '/shelf.git@ce379aa3c22024edb2df3657fd564f1f463406e6',
'engine/src/third_party/dart/third_party/pkg/source_map_stack_trace':
- Var('dart_git') + '/source_map_stack_trace.git@72dbf21a33293b2b8434d0a9751e36f9463981ac',
+ Var('dart_git') + '/source_map_stack_trace.git@b83af01938225c1706bbc6c1f86bd4a394f91380',
'engine/src/third_party/dart/third_party/pkg/source_maps':
- Var('dart_git') + '/source_maps.git@e93565b43a7b6b367789de8ffba969c4ebeeb317',
+ Var('dart_git') + '/source_maps.git@dd5b5cd5704927d99b33065a24d7eb03c535034d',
'engine/src/third_party/dart/third_party/pkg/source_span':
- Var('dart_git') + '/source_span.git@ff03af16474ce91c89eb3bc28182866f4cb6dfb0',
+ Var('dart_git') + '/source_span.git@4dc78fb33d37153a3ac55aee201a9a7b62c40ce7',
'engine/src/third_party/dart/third_party/pkg/sse':
- Var('dart_git') + '/sse.git@00084c43684ddaf7e09c19c5364c4a27eb04efda',
+ Var('dart_git') + '/sse.git@bfcbcd7a7320c74dfee154152419381c508a1fad',
'engine/src/third_party/dart/third_party/pkg/stack_trace':
- Var('dart_git') + '/stack_trace.git@17f09c2c6845bb31c7c385acecce5befb8527a13',
+ Var('dart_git') + '/stack_trace.git@8b2046ecac56f5bb9196033ed187da0cf73eac67',
'engine/src/third_party/dart/third_party/pkg/stream_channel':
- Var('dart_git') + '/stream_channel.git@8e0d7ef1f4a3fb97fbd82e11cd539093f58511f3',
+ Var('dart_git') + '/stream_channel.git@b1d3384638064a4f25beacef3be770e2c4534408',
'engine/src/third_party/dart/third_party/pkg/string_scanner':
- Var('dart_git') + '/string_scanner.git@2d84b16d8ae03c3a8c2417b71abe0fe6de7d8bf6',
+ Var('dart_git') + '/string_scanner.git@6bb314f2176598a5ecc4770a3bbd42626e18b576',
'engine/src/third_party/dart/third_party/pkg/term_glyph':
- Var('dart_git') + '/term_glyph.git@ec7cf7bb51ebb7d55760a1359f6697690dbc06ba',
+ Var('dart_git') + '/term_glyph.git@4daa34eea4bd6d9780aaeadbf6665af3ebb402fd',
'engine/src/third_party/dart/third_party/pkg/test':
- Var('dart_git') + '/test.git@5f52c524cd10ba3dd9aa5614955c338d50b29d21',
+ Var('dart_git') + '/test.git@e7ae6139b85312b5229a6b139a14554992fe6e85',
'engine/src/third_party/dart/third_party/pkg/test_reflective_loader':
- Var('dart_git') + '/test_reflective_loader.git@8d0de01bbe852fea1f8e33aba907abcba50a8a1e',
+ Var('dart_git') + '/test_reflective_loader.git@40d61b16647cd61b02d806fea46362ef07e7c502',
+
+ 'engine/src/third_party/dart/third_party/pkg/tools':
+ Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
'engine/src/third_party/dart/third_party/pkg/typed_data':
- Var('dart_git') + '/typed_data.git@6369490ede1c87a4a5758304a606a6e4eee364b9',
+ Var('dart_git') + '/typed_data.git@8d29573ab6fd26a272dc846255eda66a01abae01',
'engine/src/third_party/dart/third_party/pkg/usage':
- Var('dart_git') + '/usage.git@e287a72228974886d8a3b40ddcdf12f69d7c6a22',
+ Var('dart_git') + '/usage.git@6ee09084596f9829371bb836f9d1ca05820f29ea',
'engine/src/third_party/dart/third_party/pkg/watcher':
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
'engine/src/third_party/dart/third_party/pkg/web_socket_channel':
- Var('dart_git') + '/web_socket_channel.git@4b46c0c4196a5e76c2b0e2589ed37de247d35938',
+ Var('dart_git') + '/web_socket_channel.git@eae225866551ea7b51a380064521186a232bc0a4',
'engine/src/third_party/dart/third_party/pkg/webdev':
Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -328,13 +505,13 @@
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
'engine/src/third_party/dart/third_party/pkg/yaml':
- Var('dart_git') + '/yaml.git@fda5b15692ccfa0feb7793a27fe3829b3d0f77fa',
+ Var('dart_git') + '/yaml.git@0b9041de94b00bc54e8d38daecfe9075b5623996',
'engine/src/third_party/dart/third_party/pkg/yaml_edit':
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
- 'engine/src/third_party/dart/tools/sdks':
- {'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:2.18.0-271.7.beta'}], 'dep_type': 'cipd'},
+ 'engine/src/third_party/dart/tools/sdks/dart-sdk':
+ {'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.
@@ -397,14 +574,14 @@
}
],
'dep_type': 'cipd',
- 'condition': 'host_os == "win" and download_dart_sdk'
+ 'condition': 'host_os == "win" and download_dart_sdk and not release_candidate'
},
'engine/src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'engine/src/third_party/expat':
- Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + 'a28238bdeebc087071777001245df1876a11f5ee',
+ Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '654d2de0da85662fcc7644a7acd7c2dd2cfb21f0',
'engine/src/third_party/freetype2':
Var('flutter_git') + '/third_party/freetype2' + '@' + '3bea2761290a1cbe7d8f75c1c5a7ad727f826a66',
@@ -422,7 +599,7 @@
Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
'engine/src/third_party/libpng':
- Var('flutter_git') + '/third_party/libpng' + '@' + '134cf139cb24d802ee6ad5fc51bccff3221c2b49',
+ Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
'engine/src/third_party/libwebp':
Var('chromium_git') + '/webm/libwebp.git' + '@' + '7dfde712a477e420968732161539011e0fd446cf', # 1.2.0
@@ -446,7 +623,7 @@
Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
'engine/src/third_party/libtess2':
- Var('flutter_git') + '/third_party/libtess2' + '@' + 'fc52516467dfa124bdd967c15c7cf9faf02a34ca',
+ Var('flutter_git') + '/third_party/libtess2' + '@' + '725e5e08ec8751477565f1d603fd7eb9058c277c',
'engine/src/third_party/sqlite':
Var('flutter_git') + '/third_party/sqlite' + '@' + '0f61bd2023ba94423b4e4c8cfb1a23de1fe6a21c',
@@ -460,10 +637,10 @@
Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '32640ad82ef648768c706c9bf828b77123a09bc2',
'engine/src/third_party/swiftshader':
- Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'bea8d2471bd912220ba59032e0738f3364632657',
+ Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5f9ed9b16931c7155171d31f75004f73f0a3abc8',
'engine/src/third_party/angle':
- Var('chromium_git') + '/angle/angle.git' + '@' + '3faaded8234b31dea24c929e40e33089a34a9aa5',
+ Var('chromium_git') + '/angle/angle.git' + '@' + '3a3a3c655a96200dcea9543f29e3042a1e0838f0',
'engine/src/third_party/vulkan_memory_allocator':
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
@@ -479,16 +656,16 @@
Var('github_git') + '/felangel/equatable.git' + '@' + '0ba67c72db8bed75877fc1caafa74112ee0bd921', # 2.0.2
'engine/src/third_party/pkg/file':
- Var('github_git') + '/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
+ Var('dart_git') + '/external/github.com/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
'engine/src/third_party/pkg/flutter_packages':
- Var('github_git') + '/flutter/packages.git' + '@' + '26990a2f75ab2028c3c77ffc869db11d6d866d18', # various
+ Var('github_git') + '/flutter/packages.git' + '@' + '25454e63851fe7933f04d025606e68c1eac4fe0f', # various
'engine/src/third_party/pkg/gcloud':
Var('github_git') + '/dart-lang/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev
'engine/src/third_party/pkg/googleapis':
- Var('github_git') + '/google/googleapis.dart.git' + '@' + '07f01b7aa6985e4cafd0fd4b98724841bc9e85a1', # various
+ Var('github_git') + '/google/googleapis.dart.git' + '@' + '526011f56d98eab183cc6075ee1392e8303e43e2', # various
'engine/src/third_party/pkg/platform':
Var('github_git') + '/google/platform.dart.git' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0
@@ -500,13 +677,19 @@
Var('github_git') + '/google/process_runner.git' + '@' + 'd632ea0bfd814d779fcc53a361ed33eaf3620a0b', # 4.0.1
'engine/src/third_party/pkg/quiver':
- Var('github_git') + '/google/quiver-dart.git' + '@' + '66f473cca1332496e34a783ba4527b04388fd561', # 2.1.5
+ Var('github_git') + '/google/quiver-dart.git' + '@' + '90b92bee895e507d435012356a8b5c5f17eafa52', # 3.2.1
'engine/src/third_party/pkg/vector_math':
- Var('github_git') + '/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
+ Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
'engine/src/third_party/imgui':
- Var('github_git') + '/ocornut/imgui.git' + '@' + '29d462ebce0275345a6ce4621d8fff0ded57c9e5',
+ Var('github_git') + '/ocornut/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d',
+
+ 'engine/src/third_party/tinygltf':
+ Var('github_git') + '/syoyo/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
+
+ 'engine/src/third_party/json':
+ Var('github_git') + '/nlohmann/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
'engine/src/third_party/gradle': {
'packages': [
@@ -599,9 +782,18 @@
],
'dep_type': 'cipd',
},
+ 'engine/src/flutter/third_party/ninja': {
+ 'packages': [
+ {
+ 'package': 'infra/3pp/tools/ninja/${{platform}}',
+ 'version': 'version:2@1.11.1.chromium.4',
+ }
+ ],
+ 'dep_type': 'cipd',
+ },
'engine/src/buildtools/emsdk': {
- 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07',
+ 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'da9699832b5df4e123403490e499c87000c22654',
'condition': 'download_emsdk',
},
@@ -611,10 +803,10 @@
'packages': [
{
'package': 'fuchsia/third_party/clang/mac-amd64',
- 'version': 'git_revision:60d276923902051192eba692e5312e605c9d9f65'
+ 'version': Var('clang_version'),
}
],
- 'condition': 'host_os == "mac"',
+ 'condition': 'host_os == "mac"', # On ARM64 Macs too because Goma doesn't support the host-arm64 toolchain.
'dep_type': 'cipd',
},
@@ -622,7 +814,7 @@
'packages': [
{
'package': 'fuchsia/third_party/clang/mac-arm64',
- 'version': 'git_revision:3a20597776a5d2920e511d81653b4d2b6ca0c855'
+ 'version': Var('clang_version'),
}
],
'condition': 'host_os == "mac" and host_cpu == "arm64"',
@@ -633,7 +825,7 @@
'packages': [
{
'package': 'fuchsia/third_party/clang/linux-amd64',
- 'version': 'git_revision:41d4067d0b7c3c955b8b6cda328bcb46e268bd6a'
+ 'version': Var('clang_version'),
}
],
'condition': 'host_os == "linux" and host_cpu == "x64"',
@@ -644,7 +836,7 @@
'packages': [
{
'package': 'fuchsia/third_party/clang/linux-arm64',
- 'version': 'git_revision:d9e02a30b16ea65a7da87913c40af03e22c9571f'
+ 'version': Var('clang_version'),
}
],
'condition': 'host_os == "linux" and host_cpu == "arm64"',
@@ -655,21 +847,54 @@
'packages': [
{
'package': 'fuchsia/third_party/clang/windows-amd64',
- 'version': 'git_revision:41d4067d0b7c3c955b8b6cda328bcb46e268bd6a'
+ 'version': Var('clang_version'),
}
],
'condition': 'download_windows_deps',
'dep_type': 'cipd',
},
- # Get the SDK from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core at the 'latest' tag
- # Get the toolchain from https://chrome-infra-packages.appspot.com/p/fuchsia/clang at the 'goma' tag
+ # GOMA
+ 'engine/src/buildtools/mac-x64/goma': {
+ 'packages': [
+ {
+ 'package': 'fuchsia/third_party/goma/client/mac-amd64',
+ 'version': Var('goma_version'),
+ }
+ ],
+ 'condition': 'use_cipd_goma and host_os == "mac"',
+ 'dep_type': 'cipd',
+ },
+ 'engine/src/buildtools/linux-x64/goma': {
+ 'packages': [
+ {
+ 'package': 'fuchsia/third_party/goma/client/linux-amd64',
+ 'version': Var('goma_version'),
+ }
+ ],
+ 'condition': 'use_cipd_goma and host_os == "linux"',
+ 'dep_type': 'cipd',
+ },
+
+ 'engine/src/buildtools/windows-x64/goma': {
+ 'packages': [
+ {
+ 'package': 'fuchsia/third_party/goma/client/windows-amd64',
+ 'version': Var('goma_version'),
+ }
+ ],
+ 'condition': 'use_cipd_goma and download_windows_deps',
+ 'dep_type': 'cipd',
+ },
+
+ # Get the SDK from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core at the 'latest' tag
+ # Get the toolchain from https://chrome-infra-packages.appspot.com/p/fuchsia/clang at the 'goma' tag
'engine/src/fuchsia/sdk/mac': {
'packages': [
{
'package': 'fuchsia/sdk/core/mac-amd64',
- 'version': '5pRBUNt0WvfjDNud4J9BFhQyRcppjzctVA2isS0KJ7sC'
+ 'version': 'h3-8RUVrC889UXou7nSXKFK3chIflBeCfQ90VO0CLicC'
}
],
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -679,12 +904,39 @@
'packages': [
{
'package': 'fuchsia/sdk/core/linux-amd64',
- 'version': 'RkKjVqE6qRWJs1q-kcWwic0RItv2Kvm4HLa5vT09mJ4C'
+ 'version': 'Xi3c5nti2LKnEOqYtWWexOTG5iXztpWipmEfWVk3h9cC'
}
],
'condition': 'host_os == "linux" and not download_fuchsia_sdk',
'dep_type': 'cipd',
},
+
+ 'engine/src/third_party/impeller-cmake-example': {
+ 'url': Var('github_git') + '/bdero/impeller-cmake-example.git' + '@' + '270e648f8c00aa900d2d16ef8a347938652d17fb',
+ 'condition': 'download_impeller_cmake_example',
+ },
+
+ # cmake is only used by impeller-cmake-example.
+ 'engine/src/buildtools/mac-x64/cmake': {
+ 'packages': [
+ {
+ 'package': 'infra/3pp/tools/cmake/mac-amd64',
+ 'version': 'CGpMvZoP962wdEINR9d4OEvEW7ZOv0MPrHNKbBUBS0sC',
+ }
+ ],
+ 'condition': 'download_impeller_cmake_example and host_os == "mac"',
+ 'dep_type': 'cipd',
+ },
+
+ 'engine/src/third_party/google_fonts_for_unit_tests': {
+ 'packages': [
+ {
+ 'package': 'flutter/flutter_font_fallbacks',
+ 'version': 'f7459e412c5cfba5a654e96a5a00fff61e018d16b8b1c41dade17b7c6aa92299'
+ }
+ ],
+ 'dep_type': 'cipd',
+ }
}
recursedeps = [
@@ -699,6 +951,12 @@
'action': ['python3', 'engine/src/third_party/dart/tools/generate_package_config.py'],
},
{
+ # Generate the sdk/version file.
+ 'name': 'Generate sdk/version',
+ 'pattern': '.',
+ 'action': ['python3', 'engine/src/third_party/dart/tools/generate_sdk_version_file.py'],
+ },
+ {
# Update the Windows toolchain if necessary.
'name': 'win_toolchain',
'condition': 'download_windows_deps',
@@ -776,6 +1034,36 @@
]
},
{
+ 'name': 'Start compiler proxy',
+ 'pattern': '.',
+ 'condition': 'use_cipd_goma and host_os == "mac"',
+ 'action': [
+ 'python3',
+ 'engine/src/buildtools/mac-x64/goma/goma_ctl.py',
+ 'ensure_start'
+ ]
+ },
+ {
+ 'name': 'Start compiler proxy',
+ 'pattern': '.',
+ 'condition': 'use_cipd_goma and host_os == "linux"',
+ 'action': [
+ 'python3',
+ 'engine/src/buildtools/linux-x64/goma/goma_ctl.py',
+ 'ensure_start'
+ ]
+ },
+ {
+ 'name': 'Start compiler proxy',
+ 'pattern': '.',
+ 'condition': 'use_cipd_goma and download_windows_deps',
+ 'action': [
+ 'python3',
+ 'engine/src/buildtools/windows-x64/goma/goma_ctl.py',
+ 'ensure_start'
+ ]
+ },
+ {
'name': 'Setup githooks',
'pattern': '.',
'condition': 'setup_githooks',
@@ -783,5 +1071,17 @@
'python3',
'engine/src/flutter/tools/githooks/setup.py',
]
+ },
+ {
+ 'name': 'impeller-cmake-example submodules',
+ 'pattern': '.',
+ 'condition': 'download_impeller_cmake_example',
+ 'action': [
+ 'python3',
+ 'engine/src/flutter/ci/impeller_cmake_build_test.py',
+ '--path',
+ 'third_party/impeller-cmake-example',
+ '--setup',
+ ]
}
]
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..1a68b63
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,8 @@
+# Dart engprod team
+athom@google.com
+sortie@google.com
+whesse@google.com
+# A few Dart vm people
+asiva@google.com
+kustermann@google.com
+vegorov@google.com
diff --git a/ci/builders/host_linux.json b/ci/builders/host_linux.json
index 2c74169..0aaa275 100644
--- a/ci/builders/host_linux.json
+++ b/ci/builders/host_linux.json
@@ -1,35 +1,14 @@
{
- "$fuchsia/goma": {
- "server": "goma.chromium.org"
- },
- "$kitchen": {
- "emulate_gce": true
- },
- "$recipe_engine/isolated": {
- "server": "https://isolateserver.appspot.com"
- },
- "$recipe_engine/swarming": {
- "server": "https://chromium-swarm.appspot.com"
- },
- "bringup": true,
- "build_android_aot": false,
- "build_android_debug": false,
- "build_android_jit_release": false,
- "build_android_vulkan": false,
- "build_fuchsia": false,
- "build_host": false,
- "build_ios": false,
"builds": [
{
"archives": [],
- "drone_builder_name": "monorepo-builder-v2",
- "gclient_custom_vars": {
- "download_android_deps": false,
- "download_dart_sdk": false
+ "gclient_variables": {
+ "download_android_deps": false
},
"gn": [
"--runtime-mode",
"debug",
+ "--full-dart-sdk",
"--goma",
"--unoptimized",
"--no-prebuilt-dart-sdk"
@@ -39,16 +18,37 @@
"config": "host_debug_unopt",
"targets": [
"flutter",
- "flutter/sky/packages",
- "flutter/lib/spirv/test/exception_shaders:spirv_compile_exception_shaders"
+ "flutter/sky/packages"
]
},
- "tests": []
+ "platform": "Linux"
+ },
+ {
+ "archives": [],
+ "gn": [
+ "--web",
+ "--runtime-mode=release"
+ ],
+ "gclient_variables": {
+ "download_android_deps": false,
+ "download_emsdk": true
+ },
+ "name": "wasm_release",
+ "ninja": {
+ "config": "wasm_release",
+ "targets": [
+ "flutter/third_party/canvaskit:canvaskit_group",
+ "flutter/third_party/canvaskit:canvaskit_chromium_group",
+ "flutter/third_party/canvaskit:skwasm_group"
+ ]
+ },
+ "platform": "Linux"
},
{
"archives": [
{
"name": "host_debug",
+ "realm": "production",
"base_path": "out/host_debug/zip_archives/",
"type": "gcs",
"include_paths": [
@@ -57,14 +57,11 @@
"out/host_debug/zip_archives/linux-x64/font-subset.zip",
"out/host_debug/zip_archives/flutter_patched_sdk.zip",
"out/host_debug/zip_archives/dart-sdk-linux-x64.zip",
- "out/host_debug/zip_archives/flutter-web-sdk-linux-x64.zip",
- "out/host_debug/zip_archives/linux-x64/linux-x64-flutter-gtk.zip"
+ "out/host_debug/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
]
}
],
- "drone_builder_name": "monorepo-builder-v2",
- "gclient_custom_vars": {
- "download_dart_sdk": false,
+ "gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -80,20 +77,21 @@
"config": "host_debug",
"targets": [
"flutter/build/archives:artifacts",
+ "flutter/build/archives:dart_sdk_archive",
"flutter/build/archives:embedder",
"flutter/build/archives:flutter_patched_sdk",
- "flutter/build/archives:dart_sdk_archive",
- "flutter/build/archives:flutter_web_sdk",
+ "flutter/web_sdk",
"flutter/tools/font-subset",
"flutter/shell/platform/linux:flutter_gtk"
]
},
- "tests": []
+ "platform": "Linux"
},
{
"archives": [
{
"name": "host_profile",
+ "realm": "production",
"base_path": "out/host_profile/zip_archives/",
"type": "gcs",
"include_paths": [
@@ -101,9 +99,7 @@
]
}
],
- "drone_builder_name": "monorepo-builder-v2",
- "gclient_custom_vars": {
- "download_dart_sdk": false,
+ "gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -122,9 +118,10 @@
"flutter/shell/platform/linux:flutter_gtk"
]
},
+ "platform": "Linux",
"tests": [
{
- "language": "python",
+ "language": "python3",
"name": "Host Tests for host_profile",
"parameters": [
"--variant",
@@ -142,6 +139,7 @@
"archives": [
{
"name": "host_release",
+ "realm": "production",
"base_path": "out/host_release/zip_archives/",
"type": "gcs",
"include_paths": [
@@ -150,9 +148,7 @@
]
}
],
- "drone_builder_name": "monorepo-builder-v2",
- "gclient_custom_vars": {
- "download_dart_sdk": false,
+ "gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -168,13 +164,13 @@
"targets": [
"flutter:unittests",
"flutter/build/archives:flutter_patched_sdk",
- "flutter/shell/platform/linux:flutter_gtk",
- "flutter/build/archives:flutter_web_sdk"
+ "flutter/shell/platform/linux:flutter_gtk"
]
},
+ "platform": "Linux",
"tests": [
{
- "language": "python",
+ "language": "python3",
"name": "Host Tests for host_release",
"parameters": [
"--variant",
@@ -187,27 +183,558 @@
"type": "local"
}
]
+ },
+ {
+ "archives": [
+ {
+ "name": "android_debug",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_debug/zip_archives/",
+ "include_paths": [
+ "out/android_debug/zip_archives/android-arm/artifacts.zip",
+ "out/android_debug/zip_archives/android-arm/symbols.zip",
+ "out/android_debug/zip_archives/download.flutter.io",
+ "out/android_debug/zip_archives/sky_engine.zip",
+ "out/android_debug/zip_archives/android-javadoc.zip"
+ ]
+ }
+ ],
+ "gn": [
+ "--android",
+ "--android-cpu=arm",
+ "--no-lto",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_debug",
+ "ninja": {
+ "config": "android_debug",
+ "targets": [
+ "flutter",
+ "flutter/sky/dist:zip_old_location",
+ "flutter/shell/platform/android:embedding_jars",
+ "flutter/shell/platform/android:abi_jars",
+ "flutter/shell/platform/android:robolectric_tests"
+ ]
+ },
+ "platform": "Linux"
+ },
+ {
+ "archives": [
+ {
+ "name": "android_profile",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_profile/zip_archives/",
+ "include_paths": [
+ "out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
+ "out/android_profile/zip_archives/android-arm-profile/linux-x64.zip",
+ "out/android_profile/zip_archives/android-arm-profile/symbols.zip",
+ "out/android_profile/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--runtime-mode",
+ "profile",
+ "--android",
+ "--android-cpu",
+ "arm",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_profile",
+ "ninja": {
+ "config": "android_profile",
+ "targets": [
+ "default",
+ "clang_x64/gen_snapshot",
+ "flutter/shell/platform/android:embedding_jars",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux",
+ "tests": []
+ },
+ {
+ "archives": [
+ {
+ "name": "android_release",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_release/zip_archives/",
+ "include_paths": [
+ "out/android_release/zip_archives/android-arm-release/artifacts.zip",
+ "out/android_release/zip_archives/android-arm-release/linux-x64.zip",
+ "out/android_release/zip_archives/android-arm-release/symbols.zip",
+ "out/android_release/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--runtime-mode",
+ "release",
+ "--android",
+ "--android-cpu",
+ "arm",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_release",
+ "ninja": {
+ "config": "android_release",
+ "targets": [
+ "default",
+ "clang_x64/gen_snapshot",
+ "flutter/shell/platform/android:embedding_jars",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux",
+ "tests": []
+ },
+ {
+ "archives": [
+ {
+ "name": "android_debug_arm64",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_debug_arm64/zip_archives/",
+ "include_paths": [
+ "out/android_debug_arm64/zip_archives/android-arm64/artifacts.zip",
+ "out/android_debug_arm64/zip_archives/android-arm64/symbols.zip",
+ "out/android_debug_arm64/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--android",
+ "--android-cpu=arm64",
+ "--no-lto",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_debug_arm64",
+ "ninja": {
+ "config": "android_debug_arm64",
+ "targets": [
+ "flutter",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux"
+ },
+ {
+ "archives": [
+ {
+ "name": "android_profile_arm64",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_profile_arm64/zip_archives/",
+ "include_paths": [
+ "out/android_profile_arm64/zip_archives/android-arm64-profile/artifacts.zip",
+ "out/android_profile_arm64/zip_archives/android-arm64-profile/linux-x64.zip",
+ "out/android_profile_arm64/zip_archives/android-arm64-profile/analyze-snapshot-linux-x64.zip",
+ "out/android_profile_arm64/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--runtime-mode",
+ "profile",
+ "--android",
+ "--android-cpu",
+ "arm64",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_profile_arm64",
+ "ninja": {
+ "config": "android_profile_arm64",
+ "targets": [
+ "default",
+ "clang_x64/gen_snapshot",
+ "flutter/shell/platform/android:analyze_snapshot",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux",
+ "tests": []
+ },
+ {
+ "archives": [
+ {
+ "name": "android_release_arm64",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_release_arm64/zip_archives/",
+ "include_paths": [
+ "out/android_release_arm64/zip_archives/android-arm64-release/artifacts.zip",
+ "out/android_release_arm64/zip_archives/android-arm64-release/linux-x64.zip",
+ "out/android_release_arm64/zip_archives/android-arm64-release/symbols.zip",
+ "out/android_release_arm64/zip_archives/android-arm64-release/analyze-snapshot-linux-x64.zip",
+ "out/android_release_arm64/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--runtime-mode",
+ "release",
+ "--android",
+ "--android-cpu",
+ "arm64",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_release_arm64",
+ "ninja": {
+ "config": "android_release_arm64",
+ "targets": [
+ "default",
+ "clang_x64/gen_snapshot",
+ "flutter/shell/platform/android:analyze_snapshot",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux",
+ "tests": []
+ },
+ {
+ "archives": [
+ {
+ "name": "android_debug_x64",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_debug_x64/zip_archives/",
+ "include_paths": [
+ "out/android_debug_x64/zip_archives/android-x64/artifacts.zip",
+ "out/android_debug_x64/zip_archives/android-x64/symbols.zip",
+ "out/android_debug_x64/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--android",
+ "--android-cpu=x64",
+ "--no-lto",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_debug_x64",
+ "ninja": {
+ "config": "android_debug_x64",
+ "targets": [
+ "flutter",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux"
+ },
+ {
+ "archives": [
+ {
+ "name": "android_profile_x64",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_profile_x64/zip_archives/",
+ "include_paths": [
+ "out/android_profile_x64/zip_archives/android-x64-profile/artifacts.zip",
+ "out/android_profile_x64/zip_archives/android-x64-profile/linux-x64.zip",
+ "out/android_profile_x64/zip_archives/android-x64-profile/symbols.zip",
+ "out/android_profile_x64/zip_archives/android-x64-profile/analyze-snapshot-linux-x64.zip",
+ "out/android_profile_x64/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--runtime-mode",
+ "profile",
+ "--android",
+ "--android-cpu",
+ "x64",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_profile_x64",
+ "ninja": {
+ "config": "android_profile_x64",
+ "targets": [
+ "default",
+ "clang_x64/gen_snapshot",
+ "flutter/shell/platform/android:analyze_snapshot",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux",
+ "tests": []
+ },
+ {
+ "archives": [
+ {
+ "name": "android_release_x64",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_release_x64/zip_archives/",
+ "include_paths": [
+ "out/android_release_x64/zip_archives/android-x64-release/artifacts.zip",
+ "out/android_release_x64/zip_archives/android-x64-release/linux-x64.zip",
+ "out/android_release_x64/zip_archives/android-x64-release/symbols.zip",
+ "out/android_release_x64/zip_archives/android-x64-release/analyze-snapshot-linux-x64.zip",
+ "out/android_release_x64/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--runtime-mode",
+ "release",
+ "--android",
+ "--android-cpu",
+ "x64",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_release_x64",
+ "ninja": {
+ "config": "android_release_x64",
+ "targets": [
+ "default",
+ "clang_x64/gen_snapshot",
+ "flutter/shell/platform/android:analyze_snapshot",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux",
+ "tests": []
+ },
+ {
+ "archives": [
+ {
+ "name": "android_debug_x86",
+ "type": "gcs",
+ "realm": "production",
+ "base_path": "out/android_debug_x86/zip_archives/",
+ "include_paths": [
+ "out/android_debug_x86/zip_archives/android-x86/artifacts.zip",
+ "out/android_debug_x86/zip_archives/android-x86/symbols.zip",
+ "out/android_debug_x86/zip_archives/download.flutter.io"
+ ]
+ }
+ ],
+ "gn": [
+ "--android",
+ "--android-cpu=x86",
+ "--no-lto",
+ "--goma",
+ "--no-prebuilt-dart-sdk"
+ ],
+ "name": "android_debug_x86",
+ "ninja": {
+ "config": "android_debug_x86",
+ "targets": [
+ "flutter",
+ "flutter/shell/platform/android:abi_jars"
+ ]
+ },
+ "platform": "Linux"
}
],
- "tests": [],
- "clobber": false,
- "cores": 8,
- "dependencies": [],
- "device_type": "none",
- "environment": "Staging",
- "exe_cipd_version": "refs/heads/main",
- "gcs_goldens_bucket": "",
- "git_branch": "main",
- "git_repo": "monorepo",
- "gold_tryjob": false,
- "goma_jobs": "200",
- "ios_debug": false,
- "ios_profile": false,
- "ios_release": false,
- "mastername": "client.flutter",
- "no_bitcode": false,
- "os": "Ubuntu",
- "recipe": "engine_v2/engine_v2",
- "upload_packages": true,
- "use_cas": true
+ "generators": {
+ "tasks": [
+ {
+ "name": "bundle_web_sdk_artifacts",
+ "parameters": [
+ "-o",
+ "src/out/flutter-web-sdk.zip",
+ "-i",
+ "src/out/wasm_release/canvaskit/canvaskit.js",
+ "canvaskit/canvaskit.js",
+ "-i",
+ "src/out/wasm_release/canvaskit/canvaskit.wasm",
+ "canvaskit/canvaskit.wasm",
+ "-i",
+ "src/out/wasm_release/canvaskit_chromium/canvaskit.js",
+ "canvaskit/chromium/canvaskit.js",
+ "-i",
+ "src/out/wasm_release/canvaskit_chromium/canvaskit.wasm",
+ "canvaskit/chromium/canvaskit.wasm",
+ "-i",
+ "src/out/wasm_release/skwasm/skwasm.js",
+ "canvaskit/skwasm.js",
+ "-i",
+ "src/out/wasm_release/skwasm/skwasm.worker.js",
+ "canvaskit/skwasm.worker.js",
+ "-i",
+ "src/out/wasm_release/skwasm/skwasm.wasm",
+ "canvaskit/skwasm.wasm",
+ "-i",
+ "src/out/host_debug/flutter_web_sdk/kernel",
+ "kernel",
+ "-i",
+ "src/out/host_debug/flutter_web_sdk/lib",
+ "lib",
+ "-i",
+ "src/out/host_debug/flutter_web_sdk/libraries.json",
+ "libraries.json"
+ ],
+ "script": "flutter/build/zip.py",
+ "language": "python3"
+ }
+ ]
+ },
+ "archives": [
+ {
+ "realm": "production",
+ "source": "out/flutter-web-sdk.zip",
+ "destination": "flutter-web-sdk.zip"
+ }
+ ],
+ "tests": [
+ {
+ "name": "flutter-plugins",
+ "platform": "Linux",
+ "shard": "flutter_plugins",
+ "gold_tryjob": "false"
+ },
+ {
+ "name": "framework-coverage",
+ "platform": "Linux",
+ "shard": "framework_coverage",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "tool-tests",
+ "platform": "Linux",
+ "shard": "tool_tests",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "android_sdk",
+ "version": "version:33v6"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-0",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "0",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-1",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "1",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-2",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "2",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-3",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "3",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-4",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "4",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-5",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "5",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-6",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "6",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tests-7-last",
+ "platform": "Linux",
+ "shard": "web_tests",
+ "subshard": "7_last",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ },
+ {
+ "name": "web-tool-tests",
+ "platform": "Linux",
+ "shard": "web_tool_tests",
+ "gold_tryjob": "false",
+ "test_dependencies": [
+ {
+ "dependency": "chrome_and_driver",
+ "version": "version:111.0a"
+ }
+ ]
+ }
+ ]
}
diff --git a/commits.json b/commits.json
index e4cd95e..77bfea6 100644
--- a/commits.json
+++ b/commits.json
@@ -1,5 +1,5 @@
{
- "engine/src/flutter":"52e213ebbd97a2166272a83b13736ffbfdb1d6ae",
- "engine/src/third_party/dart":"e6caafcc3a6cbf59608c506ba450abb109141636",
- "flutter":"5848306e3784d0a8fe88f29d63f8749151a2677d"
+ "engine/src/flutter":"ac954eefda9937e2bacb1143238e2f6b91d1fa8e",
+ "engine/src/third_party/dart":"e5a68252e32ac3092b401d5afc0f59b2847e0ced",
+ "flutter":"40bb615b0c96b2ca2ec2777fe9ea6aa20c815b14"
}
\ No newline at end of file
