Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 4bb55da

Browse files
author
Jonah Williams
authored
Merge branch 'main' into convert_more_tests1232
2 parents 776dc12 + d4d9537 commit 4bb55da

File tree

161 files changed

+5780
-5233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+5780
-5233
lines changed

‎DEPS‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '03732b9f885e6e2cdf047c43c92903f2993f92c3',
17+
'skia_revision': '0c6dd1e6ff8eec2f109317b58968f9dee47be93a',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,7 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': 'acbbbe73b5ebe15741d9e2f970fffa9fc63cc15a',
59+
'dart_revision': 'f5d1368990822d967caf5a29b91b2f5ed31324aa',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -66,7 +66,7 @@ vars = {
6666
'dart_browser_launcher_rev': 'fe7ffa13ba59ec6f7d56256f79059344555fdaf2',
6767
'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
6868
'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
69-
'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
69+
'dart_devtools_rev': '14084d20946268f2d22c5ed55bd53e0176748368',
7070
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7171
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
@@ -76,7 +76,7 @@ vars = {
7676
'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
7777
'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
7878
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
79-
'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
79+
'dart_webkit_inspection_protocol_rev': '119b877ae82bd2ca4cf7e5144d3a5ec104055164',
8080
'dart_yaml_edit_rev': '5c54d455f272bbb83c948ac420c677371e69ae77',
8181

8282
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -251,7 +251,7 @@ vars = {
251251
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
252252
# will be used altogether with fuchsia-sdk to setup the build / test
253253
# environment.
254-
'fuchsia_test_scripts_version': 'dUCMHqU6ihfIFKAw88NUc3XpHdVGGIsPj4SqqqkRMyoC',
254+
'fuchsia_test_scripts_version': 'AYS3tfC91ZRfdmIL01HjRhue-6gbbMMwad4lTp_d12oC',
255255

256256
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
257257
# used altogether with fuchsia-sdk to generate gn based build rules.
@@ -277,7 +277,7 @@ allowed_hosts = [
277277
]
278278

279279
deps = {
280-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e92499322525306bd637eb79d1e6dd507d5f3062',
280+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6ef931b950d5b9477dba0e278b7006ae327e12f7',
281281

282282
'src/flutter/third_party/depot_tools':
283283
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -347,7 +347,7 @@ deps = {
347347
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@654ee6e2504f11fb0e982a2cf276bafa750f694b',
348348

349349
'src/flutter/third_party/dart/third_party/devtools':
350-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:e77d6ce142b7bc737af3652f5727e449e84b7b03'}]},
350+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:14084d20946268f2d22c5ed55bd53e0176748368'}]},
351351

352352
'src/flutter/third_party/dart/third_party/pkg/args':
353353
Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',
@@ -386,7 +386,7 @@ deps = {
386386
Var('dart_git') + '/dart_style.git@f7bd4c42ad6015143f08931540631448048f692d',
387387

388388
'src/flutter/third_party/dart/third_party/pkg/dartdoc':
389-
Var('dart_git') + '/dartdoc.git@5230f8fd10d51ef379993928ae5813bda103b78d',
389+
Var('dart_git') + '/dartdoc.git@ce098154b16255bbc9ddfa89e3f6141262645513',
390390

391391
'src/flutter/third_party/dart/third_party/pkg/file':
392392
Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
@@ -485,7 +485,7 @@ deps = {
485485
Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
486486

487487
'src/flutter/third_party/dart/third_party/pkg/test':
488-
Var('dart_git') + '/test.git@d0dc83372a65dffe164242213639a40d5bb7a9bb',
488+
Var('dart_git') + '/test.git@9fbbfdbee18a686e3f84a386a01960ea0543ba01',
489489

490490
'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
491491
Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -969,7 +969,7 @@ deps = {
969969
'packages': [
970970
{
971971
'package': 'fuchsia/sdk/core/linux-amd64',
972-
'version': 'uF76DfQgigt4utdBvVnBKNYRzcyUop6NgLUW1VNm35kC'
972+
'version': '2LTVy4Gv76DcMpz4VBhnwBBKhsSZssxsG-TYqSdMrKIC'
973973
}
974974
],
975975
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎ci/builders/mac_clang_tidy.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"debug",
1616
"--prebuilt-dart-sdk",
1717
"--no-lto",
18-
"--force-mac-arm64",
1918
"--target-dir",
2019
"ci/host_debug_clang_tidy",
2120
"--rbe",
@@ -44,7 +43,6 @@
4443
"debug",
4544
"--simulator",
4645
"--no-lto",
47-
"--force-mac-arm64",
4846
"--target-dir",
4947
"ci/ios_debug_sim_clang_tidy",
5048
"--rbe",
@@ -87,7 +85,6 @@
8785
"debug",
8886
"--prebuilt-dart-sdk",
8987
"--no-lto",
90-
"--force-mac-arm64",
9188
"--target-dir",
9289
"ci/host_debug_clang_tidy",
9390
"--rbe",
@@ -137,7 +134,6 @@
137134
"debug",
138135
"--prebuilt-dart-sdk",
139136
"--no-lto",
140-
"--force-mac-arm64",
141137
"--target-dir",
142138
"ci/host_debug_clang_tidy",
143139
"--rbe",
@@ -187,7 +183,6 @@
187183
"debug",
188184
"--prebuilt-dart-sdk",
189185
"--no-lto",
190-
"--force-mac-arm64",
191186
"--target-dir",
192187
"ci/host_debug_clang_tidy",
193188
"--rbe",
@@ -237,7 +232,6 @@
237232
"debug",
238233
"--prebuilt-dart-sdk",
239234
"--no-lto",
240-
"--force-mac-arm64",
241235
"--target-dir",
242236
"ci/host_debug_clang_tidy",
243237
"--rbe",
@@ -288,7 +282,6 @@
288282
"debug",
289283
"--prebuilt-dart-sdk",
290284
"--no-lto",
291-
"--force-mac-arm64",
292285
"--target-dir",
293286
"ci/host_debug_clang_tidy",
294287
"--rbe",
@@ -306,7 +299,6 @@
306299
"debug",
307300
"--simulator",
308301
"--no-lto",
309-
"--force-mac-arm64",
310302
"--target-dir",
311303
"ci/ios_debug_sim_clang_tidy",
312304
"--rbe",

‎ci/builders/mac_ios_engine.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
{
44
"drone_dimensions": [
55
"device_type=none",
6-
"os=Mac-13|Mac-14",
7-
"cpu=x86"
6+
"os=Mac-13|Mac-14"
87
],
98
"gclient_variables": {
109
"download_android_deps": false,
@@ -231,8 +230,7 @@
231230
{
232231
"drone_dimensions": [
233232
"device_type=none",
234-
"os=Mac-13|Mac-14",
235-
"cpu=x86"
233+
"os=Mac-13|Mac-14"
236234
],
237235
"gclient_variables": {
238236
"download_android_deps": false,

‎ci/builders/mac_unopt.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@
354354
"--unoptimized",
355355
"--no-lto",
356356
"--prebuilt-dart-sdk",
357-
"--force-mac-arm64",
358357
"--mac-cpu",
359358
"arm64",
360359
"--rbe",
@@ -415,7 +414,6 @@
415414
"debug",
416415
"--simulator",
417416
"--no-lto",
418-
"--force-mac-arm64",
419417
"--simulator-cpu",
420418
"arm64",
421419
"--rbe",
@@ -483,7 +481,6 @@
483481
"debug",
484482
"--simulator",
485483
"--no-lto",
486-
"--force-mac-arm64",
487484
"--simulator-cpu",
488485
"arm64",
489486
"--darwin-extension-safe",

‎ci/licenses_golden/excluded_files‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
../../../flutter/impeller/entity/contents/host_buffer_unittests.cc
167167
../../../flutter/impeller/entity/contents/test
168168
../../../flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc
169-
../../../flutter/impeller/entity/draw_order_resolver_unittests.cc
170169
../../../flutter/impeller/entity/entity_pass_target_unittests.cc
171170
../../../flutter/impeller/entity/entity_pass_unittests.cc
172171
../../../flutter/impeller/entity/entity_unittests.cc
@@ -2706,7 +2705,9 @@
27062705
../../../flutter/third_party/skia/include/gpu/gl/egl/BUILD.bazel
27072706
../../../flutter/third_party/skia/include/gpu/gl/epoxy/BUILD.bazel
27082707
../../../flutter/third_party/skia/include/gpu/gl/glx/BUILD.bazel
2708+
../../../flutter/third_party/skia/include/gpu/graphite/BUILD.bazel
27092709
../../../flutter/third_party/skia/include/gpu/graphite/mtl/BUILD.bazel
2710+
../../../flutter/third_party/skia/include/gpu/graphite/vk/BUILD.bazel
27102711
../../../flutter/third_party/skia/include/gpu/mock/BUILD.bazel
27112712
../../../flutter/third_party/skia/include/gpu/mtl/BUILD.bazel
27122713
../../../flutter/third_party/skia/include/gpu/vk/BUILD.bazel
@@ -2862,6 +2863,15 @@
28622863
../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/BUILD.bazel
28632864
../../../flutter/third_party/skia/src/gpu/ganesh/text/BUILD.bazel
28642865
../../../flutter/third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
2866+
../../../flutter/third_party/skia/src/gpu/graphite/BUILD.bazel
2867+
../../../flutter/third_party/skia/src/gpu/graphite/compute/BUILD.bazel
2868+
../../../flutter/third_party/skia/src/gpu/graphite/dawn/BUILD.bazel
2869+
../../../flutter/third_party/skia/src/gpu/graphite/geom/BUILD.bazel
2870+
../../../flutter/third_party/skia/src/gpu/graphite/mtl/BUILD.bazel
2871+
../../../flutter/third_party/skia/src/gpu/graphite/render/BUILD.bazel
2872+
../../../flutter/third_party/skia/src/gpu/graphite/task/BUILD.bazel
2873+
../../../flutter/third_party/skia/src/gpu/graphite/text/BUILD.bazel
2874+
../../../flutter/third_party/skia/src/gpu/graphite/vk/BUILD.bazel
28652875
../../../flutter/third_party/skia/src/gpu/mtl/BUILD.bazel
28662876
../../../flutter/third_party/skia/src/gpu/tessellate/BUILD.bazel
28672877
../../../flutter/third_party/skia/src/gpu/vk/BUILD.bazel
@@ -3430,9 +3440,6 @@
34303440
../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/dist/lib/asan/ld.so.1
34313441
../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/dist/lib/hwasan/ld.so.1
34323442
../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/dist/lib/ld.so.1
3433-
../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/dist/lib/asan/ld.so.1
3434-
../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/dist/lib/hwasan/ld.so.1
3435-
../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/dist/lib/ld.so.1
34363443
../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/dist/lib/asan/ld.so.1
34373444
../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/dist/lib/hwasan/ld.so.1
34383445
../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/dist/lib/ld.so.1
@@ -3442,35 +3449,38 @@
34423449
../../../fuchsia/sdk/linux/obj/arm64-api-21/sysroot/dist/lib/asan/ld.so.1
34433450
../../../fuchsia/sdk/linux/obj/arm64-api-21/sysroot/dist/lib/hwasan/ld.so.1
34443451
../../../fuchsia/sdk/linux/obj/arm64-api-21/sysroot/dist/lib/ld.so.1
3452+
../../../fuchsia/sdk/linux/obj/arm64-api-22/sysroot/dist/lib/asan/ld.so.1
3453+
../../../fuchsia/sdk/linux/obj/arm64-api-22/sysroot/dist/lib/hwasan/ld.so.1
3454+
../../../fuchsia/sdk/linux/obj/arm64-api-22/sysroot/dist/lib/ld.so.1
34453455
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
34463456
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/hwasan/ld.so.1
34473457
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/ld.so.1
34483458
../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/dist/lib/asan/ld.so.1
34493459
../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/dist/lib/ld.so.1
34503460
../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/dist/lib/asan/ld.so.1
34513461
../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/dist/lib/ld.so.1
3452-
../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/dist/lib/asan/ld.so.1
3453-
../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/dist/lib/ld.so.1
34543462
../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/dist/lib/asan/ld.so.1
34553463
../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/dist/lib/ld.so.1
34563464
../../../fuchsia/sdk/linux/obj/riscv64-api-20/sysroot/dist/lib/asan/ld.so.1
34573465
../../../fuchsia/sdk/linux/obj/riscv64-api-20/sysroot/dist/lib/ld.so.1
34583466
../../../fuchsia/sdk/linux/obj/riscv64-api-21/sysroot/dist/lib/asan/ld.so.1
34593467
../../../fuchsia/sdk/linux/obj/riscv64-api-21/sysroot/dist/lib/ld.so.1
3468+
../../../fuchsia/sdk/linux/obj/riscv64-api-22/sysroot/dist/lib/asan/ld.so.1
3469+
../../../fuchsia/sdk/linux/obj/riscv64-api-22/sysroot/dist/lib/ld.so.1
34603470
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
34613471
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/ld.so.1
34623472
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/asan/ld.so.1
34633473
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/ld.so.1
34643474
../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/dist/lib/asan/ld.so.1
34653475
../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/dist/lib/ld.so.1
3466-
../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/dist/lib/asan/ld.so.1
3467-
../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/dist/lib/ld.so.1
34683476
../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/dist/lib/asan/ld.so.1
34693477
../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/dist/lib/ld.so.1
34703478
../../../fuchsia/sdk/linux/obj/x64-api-20/sysroot/dist/lib/asan/ld.so.1
34713479
../../../fuchsia/sdk/linux/obj/x64-api-20/sysroot/dist/lib/ld.so.1
34723480
../../../fuchsia/sdk/linux/obj/x64-api-21/sysroot/dist/lib/asan/ld.so.1
34733481
../../../fuchsia/sdk/linux/obj/x64-api-21/sysroot/dist/lib/ld.so.1
3482+
../../../fuchsia/sdk/linux/obj/x64-api-22/sysroot/dist/lib/asan/ld.so.1
3483+
../../../fuchsia/sdk/linux/obj/x64-api-22/sysroot/dist/lib/ld.so.1
34743484
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
34753485
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/ld.so.1
34763486
../../../fuchsia/sdk/linux/packages/blobs

‎ci/licenses_golden/licenses_dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: e48d41e84c515410fff97f4df84223f1
1+
Signature: 9ab27c529b81d93164d8e2cd1021c0c5
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4769,7 +4769,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47694769
This Source Code Form is "Incompatible With Secondary Licenses", as
47704770
defined by the Mozilla Public License, v. 2.0.
47714771

4772-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0486e486778ad5bf3c34a0bb6de7d9b859e6a9d2
4772+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/f5d1368990822d967caf5a29b91b2f5ed31324aa
47734773
/third_party/fallback_root_certificates/
47744774

47754775
====================================================================================================

0 commit comments

Comments
 (0)