DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Manual roll Skia from 39aa2a70213a to 9a983f6c2c06 (#181986)

Browse Source 
Includes updates for the renaming of SkDebug to SkLog
This commit is contained in:
Jason Simmons 2026-02-06 13:04:10 -08:00 committed by GitHub
parent 4c19c37beb
commit 3e015d2dab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -15,7 +15,7 @@ vars = {
'flutter_git': 'https://flutter.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
'llvm_git': 'https://llvm.googlesource.com',
'skia_revision': '39aa2a70213a831964d763dfd1dcd6a5f3410da1',
'skia_revision': '9a983f6c2c06a8396cc1dd2d579df5919fd6ea99',
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

12
engine/src/flutter/skia/BUILD.gn
View File

@ -708,8 +708,8 @@ skia_component("skia") {
if (is_win) {
sources += skia_ports_windows_sources
sources += [
"$_skia_root/src/ports/SkDebug_win.cpp",
"$_skia_root/src/ports/SkImageGeneratorWIC.cpp",
"$_skia_root/src/ports/SkLog_win.cpp",
]
libs += [
"Ole32.lib",
@ -732,7 +732,7 @@ skia_component("skia") {
if (is_android) {
deps += [ "//flutter/third_party/expat" ]
sources += [ "$_skia_root/src/ports/SkDebug_android.cpp" ]
sources += [ "$_skia_root/src/ports/SkLog_android.cpp" ]
libs += [
"EGL",
"GLESv2",
@ -741,7 +741,7 @@ skia_component("skia") {
}
if (is_linux || is_wasm || is_qnx) {
sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ]
sources += [ "$_skia_root/src/ports/SkLog_stdio.cpp" ]
if (skia_use_egl) {
libs += [ "GLESv2" ]
}
@ -750,8 +750,8 @@ skia_component("skia") {
if (is_mac) {
public += [ "$_skia_root/include/ports/SkCFObject.h" ]
sources += [
"$_skia_root/src/ports/SkDebug_stdio.cpp",
"$_skia_root/src/ports/SkImageGeneratorCG.cpp",
"$_skia_root/src/ports/SkLog_stdio.cpp",
]
frameworks = [
"ApplicationServices.framework",
@ -762,8 +762,8 @@ skia_component("skia") {
if (is_ios) {
public += [ "$_skia_root/include/ports/SkCFObject.h" ]
sources += [
"$_skia_root/src/ports/SkDebug_stdio.cpp",
"$_skia_root/src/ports/SkImageGeneratorCG.cpp",
"$_skia_root/src/ports/SkLog_stdio.cpp",
]
frameworks = [
"CoreFoundation.framework",
@ -773,6 +773,6 @@ skia_component("skia") {
}
if (is_fuchsia) {
sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ]
sources += [ "$_skia_root/src/ports/SkLog_stdio.cpp" ]
}
}

7
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@ -17184,6 +17184,13 @@ skia
Copyright 2026 Google LLC
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
--------------------------------------------------------------------------------
skia
Copyright 2026 The Android Open Source Project
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
--------------------------------------------------------------------------------