diff --git a/DEPS b/DEPS index e84a7c704f6b4..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. @@ -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', }, 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, 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