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

Side by Side Diff: ui/gfx/surface/surface.gyp

Issue 7227009: Add chromium_code: 1 to surface.gyp and gl.gyp to pick up -Werror. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: foo Created 9 years, 5 months 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
« no previous file with comments | « ui/gfx/gl/gl_surface_glx.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': {
7 'chromium_code': 1,
8 },
9
6 'target_defaults': { 10 'target_defaults': {
7 'sources/': [
8 ['exclude', '/(cocoa|gtk|win)/'],
9 ['exclude', '_(cocoa|gtk|linux|mac|posix|win|x)\\.(cc|mm?)$'],
10 ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
11 ],
12 'conditions': [ 11 'conditions': [
13 ['toolkit_uses_gtk == 1', { 12 ['toolkit_uses_gtk == 1', {
14 'sources/': [
15 ['include', '/gtk/'],
16 ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
17 ['include', '/(gtk|x11)_[^/]*\\.cc$'],
18 ],
19 'include_dirs': [ 13 'include_dirs': [
20 '<(DEPTH)/third_party/angle/include', 14 '<(DEPTH)/third_party/angle/include',
21 ], 15 ],
22 }], 16 }],
23 ['OS=="mac"', {'sources/': [
24 ['include', '/cocoa/'],
25 ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],
26 ]}, { # else: OS != "mac"
27 'sources/': [
28 ['exclude', '\\.mm?$'],
29 ],
30 }],
31 ['OS=="win"',
32 {'sources/': [
33 ['include', '_(win)\\.cc$'],
34 ['include', '/win/'],
35 ['include', '/win_[^/]*\\.cc$'],
36 ]}],
37 ], 17 ],
38 }, 18 },
39 'targets': [ 19 'targets': [
40 { 20 {
41 'target_name': 'surface', 21 'target_name': 'surface',
42 'type': 'static_library', 22 'type': 'static_library',
43 'dependencies': [ 23 'dependencies': [
44 '<(DEPTH)/base/base.gyp:base', 24 '<(DEPTH)/base/base.gyp:base',
45 '<(DEPTH)/skia/skia.gyp:skia', 25 '<(DEPTH)/skia/skia.gyp:skia',
46 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 26 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
47 '<(DEPTH)/ui/ui.gyp:ui_gfx', 27 '<(DEPTH)/ui/ui.gyp:ui_gfx',
48 ], 28 ],
49 'sources': [ 29 'sources': [
50 'accelerated_surface_linux.cc', 30 'accelerated_surface_linux.cc',
51 'accelerated_surface_linux.h', 31 'accelerated_surface_linux.h',
52 'accelerated_surface_mac.cc', 32 'accelerated_surface_mac.cc',
53 'accelerated_surface_mac.h', 33 'accelerated_surface_mac.h',
54 'io_surface_support_mac.cc', 34 'io_surface_support_mac.cc',
55 'io_surface_support_mac.h', 35 'io_surface_support_mac.h',
56 'transport_dib.h', 36 'transport_dib.h',
57 'transport_dib_linux.cc', 37 'transport_dib_linux.cc',
58 'transport_dib_mac.cc', 38 'transport_dib_mac.cc',
59 'transport_dib_win.cc', 39 'transport_dib_win.cc',
60 ], 40 ],
61 }, 41 },
62 ], 42 ],
63 } 43 }
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl_surface_glx.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698