summaryrefslogtreecommitdiff
path: root/chromium/skia/skia.gyp
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/skia/skia.gyp
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/skia/skia.gyp')
-rw-r--r--chromium/skia/skia.gyp5
1 files changed, 1 insertions, 4 deletions
diff --git a/chromium/skia/skia.gyp b/chromium/skia/skia.gyp
index d1a227557c6..af1cc531d44 100644
--- a/chromium/skia/skia.gyp
+++ b/chromium/skia/skia.gyp
@@ -65,14 +65,11 @@
],
'defines': [
'SKIA_DLL',
- 'GR_DLL=1',
- 'GR_IMPLEMENTATION=1',
'SKIA_IMPLEMENTATION=1',
],
'direct_dependent_settings': {
'defines': [
'SKIA_DLL',
- 'GR_DLL=1',
],
},
},
@@ -87,7 +84,7 @@
],
}],
],
-
+
# targets that are not dependent upon the component type
'targets': [
{