skia/skia_library.gypi - Issue 68343015: Roll Skia DEPS to 12260

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 68343015: Roll Skia DEPS to 12260 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix the big hammer Created 7 years, 1 month 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 6a741fecd32107fb28a83030ca920aa01d937f37..46d59a8d129d3ff8902a60feb755b8ee4f0e0d79 100644

--- a/skia/skia_library.gypi

+++ b/skia/skia_library.gypi

@@ -56,6 +56,9 @@

'skia_export_defines': [

'SK_BUILD_FOR_ANDROID',

+ 'defines': [

bungeman-skia 2013/11/12 21:43:42 Be sure to remove this 'defines' block before comm

robertphillips 2013/11/12 23:00:23 Done.

+ 'SK_FONTHOST_DOES_NOT_USE_FONTMGR',

+ ],

}],

@@ -373,9 +376,6 @@

'../third_party/skia/include/utils/win',

'../third_party/skia/src/utils/win',

- 'defines': [

- 'SK_FONTHOST_USES_FONTMGR',

- ],

},{ # not 'OS == "win"'

'sources!': [

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

@@ -432,6 +432,8 @@

'IGNORE_ROT_AA_RECT_OPT',

+ 'SK_IGNORE_BLURRED_RRECT_OPT',

'SK_IGNORE_QUAD_RR_CORNERS_OPT',

'SKIA_IGNORE_GPU_MIPMAPS',

« no previous file with comments | « skia/skia_common.gypi ('k') | skia/skia_library_opts.gyp » ('j') | no next file with comments »