Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Side by Side Diff: skia/skia.gyp

Issue 11412302: Roll Clang 167488:168474. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simplify Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'skia', 8 'target_name': 'skia',
9 'type': '<(component)', 9 'type': '<(component)',
10 'variables': { 10 'variables': {
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 'include_dirs': [ 254 'include_dirs': [
255 '../third_party/skia/include/gpu', 255 '../third_party/skia/include/gpu',
256 '../third_party/skia/include/gpu/gl', 256 '../third_party/skia/include/gpu/gl',
257 '../third_party/skia/src/gpu', 257 '../third_party/skia/src/gpu',
258 ], 258 ],
259 }, { # skia_support_gpu == 0 259 }, { # skia_support_gpu == 0
260 'defines': [ 260 'defines': [
261 'SK_SUPPORT_GPU=0', 261 'SK_SUPPORT_GPU=0',
262 ], 262 ],
263 }], 263 }],
264 ['clang == 1', {
265 # TODO(hans): Remove once Skia rolls past r6641.
266 'cflags': [
267 '-Wno-tautological-constant-out-of-range-compare',
268 ],
269 'xcode_settings': {
270 'WARNING_CFLAGS': [
271 '-Wno-tautological-constant-out-of-range-compare',
272 ],
273 }
274 }],
264 ['release_valgrind_build == 1', { 275 ['release_valgrind_build == 1', {
265 'defines': [ 276 'defines': [
266 'SK_DEBUG_PATH_REF=1', 277 'SK_DEBUG_PATH_REF=1',
267 ], 278 ],
268 'direct_dependent_settings': { 279 'direct_dependent_settings': {
269 'defines': [ 280 'defines': [
270 'SK_DEBUG_PATH_REF=1', 281 'SK_DEBUG_PATH_REF=1',
271 ], 282 ],
272 }, 283 },
273 }], 284 }],
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 'sources': [ 854 'sources': [
844 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', 855 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
845 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 856 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
846 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', 857 '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
847 ], 858 ],
848 }, 859 },
849 ], 860 ],
850 }], 861 }],
851 ], 862 ],
852 } 863 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/process_proxy/process_output_watcher.cc ('k') | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698