From c896f5fac44e3dfc514772e5bbe59b7e046309ce Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Wed, 1 Nov 2023 12:32:13 -0700 Subject: [PATCH 1/3] Bump impeller-cmake to head (#47563) https://github.com/bdero/impeller-cmake/pull/20 Fixes breakages from: * https://github.com/flutter/engine/pull/47080 * https://github.com/flutter/engine/pull/47247 * https://github.com/flutter/engine/pull/47278 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index e84a7c704f6b4..562e2323d0f18 100644 --- a/DEPS +++ b/DEPS @@ -921,7 +921,7 @@ deps = { }, 'src/third_party/impeller-cmake-example': { - 'url': Var('github_git') + '/bdero/impeller-cmake-example.git' + '@' + 'ad78e80741349dda91c8a17fd16919655406e7d8', + 'url': Var('github_git') + '/bdero/impeller-cmake-example.git' + '@' + 'd1a26a51dc6890e5f851749e3d8e048703f24f51', 'condition': 'download_impeller_cmake_example', }, From 1833429a63ab1a40fc1040d0386ae71891a77473 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 1 Nov 2023 15:39:22 -0400 Subject: [PATCH 2/3] Roll Skia from 613abdf2c895 to 945284d57785 (1 revision) (#47564) https://skia.googlesource.com/skia.git/+log/613abdf2c895..945284d57785 2023-11-01 kjlubick@google.com Remove modules/skplaintexteditor 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,herb@google.com,rmistry@google.com,zra@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/excluded_files | 1 - ci/licenses_golden/licenses_skia | 22 +--------------------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/DEPS b/DEPS index 562e2323d0f18..58a08454e8468 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': '613abdf2c8951be2de381d3f17b3eb2c4e2f6d8c', + 'skia_revision': '945284d57785315ea6087518afc79b153d2476ab', # 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/excluded_files b/ci/licenses_golden/excluded_files index 1551a8af648cf..f37b6d57a239e 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2835,7 +2835,6 @@ ../../../third_party/skia/modules/skparagraph/src/BUILD.bazel ../../../third_party/skia/modules/skparagraph/tests ../../../third_party/skia/modules/skparagraph/utils/BUILD.bazel -../../../third_party/skia/modules/skplaintexteditor/README.md ../../../third_party/skia/modules/skresources/BUILD.bazel ../../../third_party/skia/modules/skresources/include/BUILD.bazel ../../../third_party/skia/modules/skresources/src/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 1dbe35c42ff10..117b80232d4dc 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2d3e4e07b566a360a414451f3c4fd698 +Signature: ae906def1a1cc8e0c09fa3d03579e15d ==================================================================================================== LIBRARY: etc1 @@ -6193,16 +6193,6 @@ ORIGIN: ../../../third_party/skia/gm/swizzle.cpp + ../../../third_party/skia/LIC ORIGIN: ../../../third_party/skia/gm/tilemodes_alpha.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkPathTypes.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/modules/skparagraph/bench/ParagraphBench.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/app/editor_application.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/include/editor.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/include/stringslice.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/include/stringview.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/src/editor.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/src/shape.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkContainers.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/base/SkMalloc.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkPixelRefPriv.h + ../../../third_party/skia/LICENSE @@ -6232,16 +6222,6 @@ FILE: ../../../third_party/skia/gm/swizzle.cpp FILE: ../../../third_party/skia/gm/tilemodes_alpha.cpp FILE: ../../../third_party/skia/include/core/SkPathTypes.h FILE: ../../../third_party/skia/modules/skparagraph/bench/ParagraphBench.cpp -FILE: ../../../third_party/skia/modules/skplaintexteditor/app/editor_application.cpp -FILE: ../../../third_party/skia/modules/skplaintexteditor/include/editor.h -FILE: ../../../third_party/skia/modules/skplaintexteditor/include/stringslice.h -FILE: ../../../third_party/skia/modules/skplaintexteditor/include/stringview.h -FILE: ../../../third_party/skia/modules/skplaintexteditor/src/editor.cpp -FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.cpp -FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h -FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp -FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp -FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h FILE: ../../../third_party/skia/src/base/SkContainers.cpp FILE: ../../../third_party/skia/src/base/SkMalloc.cpp FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h From eec2ae4ab4f1165473e5580fa4204ccbe2a629b4 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 1 Nov 2023 17:18:12 -0700 Subject: [PATCH 3/3] Change FTL test to high capacity device (#47579) Changes the FTL tests to use a high capacity device Similar PR from packages repo: https://github.com/flutter/packages/pull/5224 The list of devices (and their capacity) is visible through the [3rd option here "Google APIs Explorer"](https://firebase.google.com/docs/test-lab/android/available-testing-devices), without a login to any project. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style --- ci/firebase_testlab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/firebase_testlab.py b/ci/firebase_testlab.py index 7b731fbb3b377..72cc2c95ef824 100755 --- a/ci/firebase_testlab.py +++ b/ci/firebase_testlab.py @@ -54,7 +54,7 @@ def run_firebase_test(apk, results_dir): '--results-dir', results_dir, '--device', - 'model=oriole,version=33', + 'model=panther,version=33', ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT,