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

Commit f7ac42e

Browse files
[flutter_releases] Flutter beta 3.10.0-1.4.pre Engine Cherrypicks (#41489)
# Flutter beta 3.10.0-1.4.pre Engine ## Scheduled Cherrypicks - Roll dart revision: dart-lang/sdk@d2b8bf9c2 - #41210 - Updates SKIA revision to `0d31aa1f49cb8cfd790c44d92a9a023839524865` --------- Co-authored-by: Jenn Magder <[email protected]>
1 parent 356ec48 commit f7ac42e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.ci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,11 @@ targets:
341341
build_host: "true"
342342
timeout: 75
343343

344-
- name: Mac mac_android_aot_engine
344+
- name: Linux mac_android_aot_engine
345345
recipe: engine_v2/engine_v2
346346
timeout: 60
347347
properties:
348348
config_name: mac_android_aot_engine
349-
$flutter/osx_sdk : >-
350-
{ "sdk_version": "14a5294e" }
351349

352350
- name: Mac mac_host_engine
353351
recipe: engine_v2/engine_v2

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': '557d71a445acf27a5154575bd5862df1671708de',
21+
'skia_revision': '0d31aa1f49cb8cfd790c44d92a9a023839524865',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,7 +48,7 @@ vars = {
4848
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
4949
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5050
# updated revision list of existing dependencies.
51-
'dart_revision': '3e0decb74dbd95982065a81c9828a65ac46531f6',
51+
'dart_revision': 'd2b8bf9c2ec1bd479dfd255ae70a62aa723df931',
5252

5353
# WARNING: DO NOT EDIT MANUALLY
5454
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

ci/licenses_golden/excluded_files

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,6 +2593,7 @@
25932593
../../../third_party/skia/fuzz/README.md
25942594
../../../third_party/skia/gn/BUILD.bazel
25952595
../../../third_party/skia/gn/__init__.py
2596+
../../../third_party/skia/gn/bazel_build.py
25962597
../../../third_party/skia/gn/call.py
25972598
../../../third_party/skia/gn/checkdir.py
25982599
../../../third_party/skia/gn/codesign_ios.py
@@ -2801,6 +2802,7 @@
28012802
../../../third_party/skia/src/pathops/BUILD.bazel
28022803
../../../third_party/skia/src/pdf/BUILD.bazel
28032804
../../../third_party/skia/src/ports/BUILD.bazel
2805+
../../../third_party/skia/src/ports/fontations/BUILD.bazel
28042806
../../../third_party/skia/src/sfnt/BUILD.bazel
28052807
../../../third_party/skia/src/shaders/BUILD.bazel
28062808
../../../third_party/skia/src/shaders/gradients/BUILD.bazel

ci/licenses_golden/licenses_skia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: cfc62da1662358812ed5c4e4991bba84
1+
Signature: 5a7c42f0a6de39a65d40e06cc0b40250
22

33
====================================================================================================
44
LIBRARY: etc1

ci/licenses_golden/licenses_third_party

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: c7076aa32145659fda171bbee067eab3
1+
Signature: 23b30509c138d889f9a9c70dcf935f30
22

33
====================================================================================================
44
LIBRARY: angle

0 commit comments

Comments
 (0)