skia/skia_library.gypi - Issue 1236953002: Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/skia_library.gypi

Issue 1236953002: Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: now with less crash on startup Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: skia/skia_library.gypi

diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi

index b138e4d537ed7a069aa3a8d9a3ad70a68b0657db..14214ea2c5b03134ff9be83152d439ef1325c1cc 100644

--- a/skia/skia_library.gypi

+++ b/skia/skia_library.gypi

@@ -46,10 +46,11 @@

'../third_party/skia/src/ports/SkFontHost_FreeType.cpp',

'../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',

'../third_party/skia/src/ports/SkFontHost_FreeType_common.h',

- '../third_party/skia/src/ports/SkFontConfigParser_android.cpp',

'../third_party/skia/src/ports/SkFontHost_mac.cpp',

'../third_party/skia/src/ports/SkFontHost_win.cpp',

- "../third_party/skia/src/ports/SkFontMgr_android.cpp",

+ '../third_party/skia/src/ports/SkFontMgr_android.cpp',

+ '../third_party/skia/src/ports/SkFontMgr_android_factory.cpp',

+ '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp',

'../third_party/skia/src/ports/SkFontMgr_win_dw.cpp',

'../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp',

'../third_party/skia/src/ports/SkOSFile_posix.cpp',

@@ -255,6 +256,11 @@

'include_dirs': [

'../third_party/expat/files/lib',

+ }, { # not 'OS == "android"'

+ 'sources!': [

+ "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp",

+ '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp',

+ ],

}],

[ 'OS == "ios"', {

'include_dirs': [

« no previous file with comments | « skia/skia_gn_files.gypi ('k') | sky/engine/platform/graphics/DecodingImageGenerator.h » ('j') | no next file with comments »