From 5b2241e4dc4abce9d9021b42ecaa6fddfaa188fa Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Fri, 19 Apr 2024 17:24:26 -0700 Subject: [PATCH 1/2] [et] Fix path canonicalization (#52274) Previously we were getting the enclosing directory path of the `et` tool (via the `dirname` builtin), then canonicalising the path by resolving symlinks. This doesn't work if the `et` on the path is itself a symlink. For example, if a user created a symlink `et` in a concrete directory at `~/.local/bin`: ``` ~/.local/bin/et -> ~/src/flutter/engines/src/flutter/bin/et ``` first we'd compute the dirname of the script: ``` ~/.local/bin ``` then we'd resolve symlinks: ``` ~/.local/bin ``` and incorrectly assume that was the engine directory. Instead, we now resolve symlinks, then compute the enclosing directory. ## Pre-launch Checklist - [X] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [X] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [X] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [X] I listed at least one issue that this PR fixes in the description above. - [ ] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [X] I updated/added relevant documentation (doc comments with `///`). - [X] I signed the [CLA]. - [X] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat --- bin/et | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/et b/bin/et index a3c30df0241d9..f5389c1af7445 100755 --- a/bin/et +++ b/bin/et @@ -27,7 +27,7 @@ function follow_links() ( echo "$file" ) -SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")") +SCRIPT_DIR="$(dirname -- "$(follow_links "${BASH_SOURCE[0]}")")" ENGINE_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)" case "$(uname -s)" in From 6f4d753ffddc5999b8025c8b87cebea389611390 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 19 Apr 2024 20:50:12 -0400 Subject: [PATCH 2/2] Roll Skia from 1910252ea26a to 514d7fc627b3 (6 revisions) (#52277) https://skia.googlesource.com/skia.git/+log/1910252ea26a..514d7fc627b3 2024-04-19 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 4737535cad1a to 71b11532ed72 (6 revisions) 2024-04-19 bungeman@google.com [paragraph] Only load typefaces once in tests 2024-04-19 michaelludwig@google.com Revert "Restore affine bitmap procs" 2024-04-19 bungeman@google.com Make sysopen python3 2024-04-19 johnstiles@google.com Replace SkIsFinite with a parameter-pack implementation. 2024-04-19 michaelludwig@google.com [graphite] One-time uploads can be discarded If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC brianosman@google.com,jsimmons@google.com,michaelludwig@google.com,rmistry@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- sky/packages/sky_engine/LICENSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index f4654f234837a..8b404892fe020 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': '1910252ea26a28be0dd2843ef67cbda4f0fa6837', + 'skia_revision': '514d7fc627b300344308e24d0cfaee0ef75c125c', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 0105df436a71d..1e6abae08892e 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: d932d7890f3c60e6e914badef26b210f +Signature: d7527fee37ff449bb61f9ccc053740a0 ==================================================================================================== LIBRARY: etc1 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 7dd04976528e7..ca6f26443c47f 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -32293,7 +32293,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2ff00e4eb7594f4d1692574821ab12dd2c83344c +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d882ce089110620be4a3d4ac5294b63aeefd6b40 /third_party/fallback_root_certificates/ --------------------------------------------------------------------------------