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

Unified Diff: skia/skia.gyp

Issue 7219009: Add Skia on Chrome for Mac gyp rules (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 6 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
===================================================================
--- skia/skia.gyp (revision 89827)
+++ skia/skia.gyp (working copy)
@@ -787,10 +787,6 @@
'defines': [
'SK_BUILD_FOR_MAC',
],
- 'sources/': [
- ['exclude', '/pdf/'],
- ['exclude', 'ext/vector_platform_device_skia\\.(cc|h)'],
- ],
'include_dirs': [
'../third_party/skia/include/utils/mac',
],
@@ -799,6 +795,20 @@
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
],
},
+ 'conditions': [
+ [ 'use_skia == 0', {
+ 'sources/': [
+ ['exclude', '/pdf/'],
+ ['exclude', 'ext/vector_platform_device_skia\\.(cc|h)'],
+ ],
+ },
+ { # use_skia
+ 'defines': [
+ 'SK_SUPPORT_888_TEXT',
+ 'SK_USE_MAC_CORE_TEXT',
+ ],
+ }],
+ ],
}],
[ '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