summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorcaryclark@chromium.org <caryclark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 19:20:22 +0000
committercaryclark@chromium.org <caryclark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 19:20:22 +0000
commit7d7564a1fb0d4a070fd902b9ba4bc63ab65b7f36 (patch)
treeb3a3d1a40ad11c38e880c80056a21483dc439174 /skia
parentaa4453d744ef18e122a318a3d8ad2f765d165ea8 (diff)
downloadchromium_src-7d7564a1fb0d4a070fd902b9ba4bc63ab65b7f36.zip
chromium_src-7d7564a1fb0d4a070fd902b9ba4bc63ab65b7f36.tar.gz
chromium_src-7d7564a1fb0d4a070fd902b9ba4bc63ab65b7f36.tar.bz2
Add Skia on Chrome for Mac gyp rules
In addition to these rules, to build the USE_SKIA_ON_MAC_CHROME variation, define: gyp_defines='use_skia=1' As is, this does not change any existing platform, and has no new tests. BUG=79463 TEST=none Review URL: http://codereview.chromium.org/7219009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp18
1 files changed, 14 insertions, 4 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 02fe86e..fa3ab38 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -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!': [