diff --git a/.ci.yaml b/.ci.yaml index 32bbe05720ca6..6a313ed6b6ef0 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -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 diff --git a/DEPS b/DEPS index 3ce1bb445f25f..96fc594840f8a 100644 --- a/DEPS +++ b/DEPS @@ -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. @@ -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 diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index b07751286200a..fa78d2aec93bc 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -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 @@ -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 diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 3d1efd1d81d1b..d559ac2f6d641 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: cfc62da1662358812ed5c4e4991bba84 +Signature: 5a7c42f0a6de39a65d40e06cc0b40250 ==================================================================================================== LIBRARY: etc1 diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 2033232e84781..1d8f293918cdc 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: c7076aa32145659fda171bbee067eab3 +Signature: 23b30509c138d889f9a9c70dcf935f30 ==================================================================================================== LIBRARY: angle