summaryrefslogtreecommitdiffstats
path: root/build
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 /build
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 'build')
-rw-r--r--build/common.gypi13
1 files changed, 13 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index f6daab8..0065483 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -146,6 +146,13 @@
'clang_use_chrome_plugins%': 0,
'conditions': [
+ # Use Skia as WebKit renderer on Mac
+ ['OS=="mac"', {
+ 'use_skia%': 0,
+ }, {
+ 'use_skia%': 1,
+ }],
+
# A flag for POSIX platforms
['OS=="win"', {
'os_posix%': 0,
@@ -220,6 +227,7 @@
'views_compositor%': '<(views_compositor)',
'os_posix%': '<(os_posix)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
+ 'use_skia%': '<(use_skia)',
'use_x11%': '<(use_x11)',
'use_gnome_keyring%': '<(use_gnome_keyring)',
'linux_fpic%': '<(linux_fpic)',
@@ -731,6 +739,11 @@
'ENABLE_EGLIMAGE=1',
],
}],
+ ['use_skia==1', {
+ 'defines': [
+ 'USE_SKIA=1',
+ ],
+ }],
['coverage!=0', {
'conditions': [
['OS=="mac"', {