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

Unified Diff: skia/skia.gyp

Issue 12379030: Remove "use_skia" variable from gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/printing.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 25449bab2d027fe44d99f298cc7311d78ed15b92..e6555b64348c18ad74f568784c0379d1f344aaf3 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -475,6 +475,8 @@
[ 'OS == "mac"', {
'defines': [
'SK_BUILD_FOR_MAC',
+ 'SK_USE_MAC_CORE_TEXT',
+# 'SK_USE_COLOR_LUMINANCE',
],
'include_dirs': [
'../third_party/skia/include/utils/mac',
@@ -492,20 +494,6 @@
# so no need for these generic versions.
'../third_party/skia/src/ports/SkFontHost_tables.cpp',
],
- 'conditions': [
- [ 'use_skia == 0', {
- 'sources/': [
- ['exclude', '/pdf/'],
- ['exclude', 'ext/vector_platform_device_skia\\.(cc|h)'],
- ],
- },
- { # use_skia
- 'defines': [
- 'SK_USE_MAC_CORE_TEXT',
-# 'SK_USE_COLOR_LUMINANCE',
- ],
- }],
- ],
}],
[ 'OS == "win"', {
'sources!': [
« no previous file with comments | « printing/printing.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698