From 53e20dc19cab46d1d6806ba68a735a05c864bccd Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Tue, 25 Apr 2023 20:14:07 +0000 Subject: [PATCH 1/6] Update Dart SDK to d2b8bf9c2ec1bd479dfd255ae70a62aa723df931 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 3ce1bb445f25f..b29c295361cf9 100644 --- a/DEPS +++ b/DEPS @@ -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 From 9759abe8b4dfeb95f18e00e5c5de731306c84e93 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 14 Apr 2023 12:08:24 -0700 Subject: [PATCH 2/6] Remove `Mac mac_android_aot_engine` in favor of Linux (#41210) `Linux mac_android_aot_engine` is passing: https://ci.chromium.org/p/flutter/builders/try/Linux%20mac_android_aot_engine/1 Remove `bringup` and remove `Mac mac_android_aot_engine` in favor of the Linux orchestrator #41181 --- .ci.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 From 31e02a115cd869deea087641fe4753987712105a Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Tue, 25 Apr 2023 20:54:09 +0000 Subject: [PATCH 3/6] update SKIA revision --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index b29c295361cf9..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. From 75caa9b486c9f4d0afd689df711f6aa4c089a36c Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Tue, 25 Apr 2023 20:55:36 +0000 Subject: [PATCH 4/6] update license --- ci/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c9a6781f973ff37bf45edbbc7248e9249771689c Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Tue, 25 Apr 2023 21:14:18 +0000 Subject: [PATCH 5/6] update SKIA license --- ci/licenses_golden/licenses_skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3ec41abfb4f58d1f1c65a0f22381b36ec14dfe5e Mon Sep 17 00:00:00 2001 From: Kevin Chisholm Date: Wed, 26 Apr 2023 03:26:23 +0000 Subject: [PATCH 6/6] update license excludes --- ci/licenses_golden/excluded_files | 2 ++ 1 file changed, 2 insertions(+) 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