Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/skia_common.gypi ('k') | skia/skia_library_opts.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 »

Powered by Google App Engine
This is Rietveld 408576698