summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorepoger@google.com <epoger@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 18:18:14 +0000
committerepoger@google.com <epoger@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 18:18:14 +0000
commit33423fa765b5be1da4675d1ec36aaf2c8abb4059 (patch)
treefa0616f98fe298bb50abcf796e6edb585c22f1ea /build/common.gypi
parent440bde333b73891d169f45eb95d290d245789efe (diff)
downloadchromium_src-33423fa765b5be1da4675d1ec36aaf2c8abb4059.zip
chromium_src-33423fa765b5be1da4675d1ec36aaf2c8abb4059.tar.gz
chromium_src-33423fa765b5be1da4675d1ec36aaf2c8abb4059.tar.bz2
Change default on Mac to use_skia=1
For context, see http://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/f8d4f43b6e66ab83# Review URL: http://codereview.chromium.org/8002009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 55654d1..2d0beb7 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -208,8 +208,11 @@
'enable_webrtc%': 1,
'conditions': [
+ # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
+ # the 'conditions' clause. Initial attempts resulted in chromium and
+ # webkit disagreeing on its setting.
['OS=="mac"', {
- 'use_skia%': 0,
+ 'use_skia%': 1,
# Mac uses clang by default, so turn on the plugin as well.
'clang_use_chrome_plugins%': 1,
}, {