summaryrefslogtreecommitdiffstats
path: root/skia/skia.gyp
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-22 14:55:01 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-22 14:55:01 +0000
commit6b694e9a167ddc755ce991b96276ab6397e5cec2 (patch)
tree308839e717afeae5bf63bbc668a923bd73ee3412 /skia/skia.gyp
parentedf99a22752ff9e505fce52de5ffe56af288136d (diff)
downloadchromium_src-6b694e9a167ddc755ce991b96276ab6397e5cec2.zip
chromium_src-6b694e9a167ddc755ce991b96276ab6397e5cec2.tar.gz
chromium_src-6b694e9a167ddc755ce991b96276ab6397e5cec2.tar.bz2
Roll Skia DEPS to r7300
control: https://codereview.chromium.org/12045012/ Review URL: https://codereview.chromium.org/12036018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
-rw-r--r--skia/skia.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 8646a2f..12fbb67 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -228,6 +228,9 @@
# it ever gets used the processes that use it need to call
# SkGraphics::Init().
'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
+
+ 'SK_IGNORE_1XN_BITMAP_OPT',
+ 'SK_IGNORE_CLIP_BUG_FIX',
],
'sources!': [
'../third_party/skia/include/core/SkTypes.h',