diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/skia/skia.gyp | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/skia/skia.gyp')
| -rw-r--r-- | chromium/skia/skia.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chromium/skia/skia.gyp b/chromium/skia/skia.gyp index af1cc531d44..4a5d62e5b43 100644 --- a/chromium/skia/skia.gyp +++ b/chromium/skia/skia.gyp @@ -66,10 +66,12 @@ 'defines': [ 'SKIA_DLL', 'SKIA_IMPLEMENTATION=1', + 'GR_GL_IGNORE_ES3_MSAA=0', ], 'direct_dependent_settings': { 'defines': [ 'SKIA_DLL', + 'GR_GL_IGNORE_ES3_MSAA=0', ], }, }, @@ -93,7 +95,6 @@ 'include_dirs': [ '..', 'config', - '../third_party/skia/include/config', '../third_party/skia/include/core', ], 'conditions': [ @@ -132,5 +133,16 @@ 'ext/image_operations_bench.cc', ], }, + { + 'target_name': 'filter_fuzz_stub', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + 'skia.gyp:skia', + ], + 'sources': [ + 'tools/filter_fuzz_stub/filter_fuzz_stub.cc', + ], + }, ], } |