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

Commit 2a10e14

Browse files
authored
Merge branch 'main' into fix-initial-vsync
2 parents f957776 + 55f4a47 commit 2a10e14

29 files changed

+2547
-207
lines changed

DEPS

Lines changed: 3 additions & 3 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': 'cf33c4e96e811ac7fd109b333e9ad93dd9adda89',
17+
'skia_revision': 'e9a7546ef3d95b26e5c6aa6a29a733789f53f570',
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.
@@ -285,7 +285,7 @@ deps = {
285285
Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
286286

287287
'src/flutter/third_party/icu':
288-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb',
288+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '4239b1559d11d4fa66c100543eda4161e060311e',
289289

290290
'src/flutter/third_party/gtest-parallel':
291291
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -875,7 +875,7 @@ deps = {
875875
'packages': [
876876
{
877877
'package': 'fuchsia/sdk/core/linux-amd64',
878-
'version': 'z1otZzn3yKuGnu1st3sH_7k77MGXtDHR5sFzq4KWYKkC'
878+
'version': 'pG2aukmcwvp71aKuS7CLjA4I9qz5FE1c2Spyk7WPYL4C'
879879
}
880880
],
881881
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

ci/licenses_golden/excluded_files

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3531,6 +3531,9 @@
35313531
../../../fuchsia/sdk/linux/obj/arm64-api-24/sysroot/dist/lib/asan/ld.so.1
35323532
../../../fuchsia/sdk/linux/obj/arm64-api-24/sysroot/dist/lib/hwasan/ld.so.1
35333533
../../../fuchsia/sdk/linux/obj/arm64-api-24/sysroot/dist/lib/ld.so.1
3534+
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/asan/ld.so.1
3535+
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/hwasan/ld.so.1
3536+
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/ld.so.1
35343537
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
35353538
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/hwasan/ld.so.1
35363539
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/ld.so.1
@@ -3544,6 +3547,8 @@
35443547
../../../fuchsia/sdk/linux/obj/riscv64-api-23/sysroot/dist/lib/ld.so.1
35453548
../../../fuchsia/sdk/linux/obj/riscv64-api-24/sysroot/dist/lib/asan/ld.so.1
35463549
../../../fuchsia/sdk/linux/obj/riscv64-api-24/sysroot/dist/lib/ld.so.1
3550+
../../../fuchsia/sdk/linux/obj/riscv64-api-25/sysroot/dist/lib/asan/ld.so.1
3551+
../../../fuchsia/sdk/linux/obj/riscv64-api-25/sysroot/dist/lib/ld.so.1
35473552
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
35483553
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/ld.so.1
35493554
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/asan/ld.so.1
@@ -3556,6 +3561,8 @@
35563561
../../../fuchsia/sdk/linux/obj/x64-api-23/sysroot/dist/lib/ld.so.1
35573562
../../../fuchsia/sdk/linux/obj/x64-api-24/sysroot/dist/lib/asan/ld.so.1
35583563
../../../fuchsia/sdk/linux/obj/x64-api-24/sysroot/dist/lib/ld.so.1
3564+
../../../fuchsia/sdk/linux/obj/x64-api-25/sysroot/dist/lib/asan/ld.so.1
3565+
../../../fuchsia/sdk/linux/obj/x64-api-25/sysroot/dist/lib/ld.so.1
35593566
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
35603567
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/ld.so.1
35613568
../../../fuchsia/sdk/linux/packages/blobs
@@ -3585,6 +3592,10 @@
35853592
../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/meta.json
35863593
../../../fuchsia/sdk/linux/pkg/driver_component_cpp/meta.json
35873594
../../../fuchsia/sdk/linux/pkg/driver_devfs_cpp/meta.json
3595+
../../../fuchsia/sdk/linux/pkg/driver_fake_bti_cpp/meta.json
3596+
../../../fuchsia/sdk/linux/pkg/driver_fake_object_cpp/meta.json
3597+
../../../fuchsia/sdk/linux/pkg/driver_fake_platform_device_cpp/meta.json
3598+
../../../fuchsia/sdk/linux/pkg/driver_fake_resource_cpp/meta.json
35883599
../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/meta.json
35893600
../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/meta.json
35903601
../../../fuchsia/sdk/linux/pkg/driver_metadata_cpp/meta.json

ci/licenses_golden/licenses_flutter

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43885,6 +43885,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics.dart + ../../../flu
4388543885
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/accessibility.dart + ../../../flutter/LICENSE
4388643886
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/checkable.dart + ../../../flutter/LICENSE
4388743887
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/focusable.dart + ../../../flutter/LICENSE
43888+
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/header.dart + ../../../flutter/LICENSE
4388843889
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/heading.dart + ../../../flutter/LICENSE
4388943890
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/image.dart + ../../../flutter/LICENSE
4389043891
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/incrementable.dart + ../../../flutter/LICENSE
@@ -46752,6 +46753,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics.dart
4675246753
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/accessibility.dart
4675346754
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/checkable.dart
4675446755
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/focusable.dart
46756+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/header.dart
4675546757
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/heading.dart
4675646758
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/image.dart
4675746759
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/incrementable.dart
@@ -59084,7 +59086,6 @@ FILE: ../../../flutter/third_party/icu/android/icudtl.dat
5908459086
FILE: ../../../flutter/third_party/icu/cast/brkitr.patch
5908559087
FILE: ../../../flutter/third_party/icu/cast/icudtl.dat
5908659088
FILE: ../../../flutter/third_party/icu/chromeos/icudtl.dat
59087-
FILE: ../../../flutter/third_party/icu/chromeos/icudtl.dat.hash
5908859089
FILE: ../../../flutter/third_party/icu/common/icudtb.dat
5908959090
FILE: ../../../flutter/third_party/icu/common/icudtl.dat
5909059091
FILE: ../../../flutter/third_party/icu/flutter/brkitr.patch

0 commit comments

Comments
 (0)