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

[flutter_releases] Flutter beta 3.10.0-1.4.pre Engine Cherrypicks #41489

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,11 @@ targets:
build_host: "true"
timeout: 75

- name: Mac mac_android_aot_engine
- name: Linux mac_android_aot_engine
recipe: engine_v2/engine_v2
timeout: 60
properties:
config_name: mac_android_aot_engine
$flutter/osx_sdk : >-
{ "sdk_version": "14a5294e" }

- name: Mac mac_host_engine
recipe: engine_v2/engine_v2
Expand Down
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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': '557d71a445acf27a5154575bd5862df1671708de',
'skia_revision': '0d31aa1f49cb8cfd790c44d92a9a023839524865',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -48,7 +48,7 @@ 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': '3e0decb74dbd95982065a81c9828a65ac46531f6',
'dart_revision': 'd2b8bf9c2ec1bd479dfd255ae70a62aa723df931',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down
2 changes: 2 additions & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2593,6 +2593,7 @@
../../../third_party/skia/fuzz/README.md
../../../third_party/skia/gn/BUILD.bazel
../../../third_party/skia/gn/__init__.py
../../../third_party/skia/gn/bazel_build.py
../../../third_party/skia/gn/call.py
../../../third_party/skia/gn/checkdir.py
../../../third_party/skia/gn/codesign_ios.py
Expand Down Expand Up @@ -2801,6 +2802,7 @@
../../../third_party/skia/src/pathops/BUILD.bazel
../../../third_party/skia/src/pdf/BUILD.bazel
../../../third_party/skia/src/ports/BUILD.bazel
../../../third_party/skia/src/ports/fontations/BUILD.bazel
../../../third_party/skia/src/sfnt/BUILD.bazel
../../../third_party/skia/src/shaders/BUILD.bazel
../../../third_party/skia/src/shaders/gradients/BUILD.bazel
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: cfc62da1662358812ed5c4e4991bba84
Signature: 5a7c42f0a6de39a65d40e06cc0b40250

====================================================================================================
LIBRARY: etc1
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: c7076aa32145659fda171bbee067eab3
Signature: 23b30509c138d889f9a9c70dcf935f30

====================================================================================================
LIBRARY: angle
Expand Down