summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-10 06:49:09 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-10 06:49:09 +0000
commit7d69480f999f2d1a2dff12f6047dedb49b1fa35f (patch)
treec77a26ef10ec7ab15d78c2bb507a9c296d3bcf6d /build/common.gypi
parent2e7ae44d08637b60d880349464f8449ea562f523 (diff)
downloadchromium_src-7d69480f999f2d1a2dff12f6047dedb49b1fa35f.zip
chromium_src-7d69480f999f2d1a2dff12f6047dedb49b1fa35f.tar.gz
chromium_src-7d69480f999f2d1a2dff12f6047dedb49b1fa35f.tar.bz2
Revert 222192 "Turn on canvas_skia for OSX"
> Turn on canvas_skia for OSX > > Re-submit of r221930, with fixed include path. > > TBR=asvitkine@chromium.org > BUG=151935 > > Review URL: https://chromiumcodereview.appspot.com/23454018 TBR=groby@chromium.org Review URL: https://codereview.chromium.org/23845004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 6e254103..08b56cd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -655,7 +655,7 @@
#
# On Aura, this allows per-tile painting to be used in the browser
# compositor.
- ['OS!="android"', {
+ ['OS!="mac" and OS!="android"', {
'use_canvas_skia%': 1,
}],