diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 20:45:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 20:45:57 +0000 |
| commit | 336629d65673b156acf7217d1d2240e31ed43185 (patch) | |
| tree | 9f01d18835036280033c1e896951c583d6a42da2 /ui/gfx/surface | |
| parent | 2df3988eda7c653886f62e65071835de05cc83a0 (diff) | |
| download | chromium_src-336629d65673b156acf7217d1d2240e31ed43185.zip chromium_src-336629d65673b156acf7217d1d2240e31ed43185.tar.gz chromium_src-336629d65673b156acf7217d1d2240e31ed43185.tar.bz2 | |
Add chromium_code: 1 to surface.gyp and gl.gyp to pick up -Werror.
It looks like this was dropped accidentally in http://codereview.chromium.org/6718027 (surface.gyp) and http://codereview.chromium.org/6722026 (gl.gyp)
Remove now-redudant code that's implied by chromium_code: 1.
Fix the warnings that have crept in since chromium_code: 1 was removed.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7227009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/surface')
| -rw-r--r-- | ui/gfx/surface/surface.gyp | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp index 960e148..a4e0122 100644 --- a/ui/gfx/surface/surface.gyp +++ b/ui/gfx/surface/surface.gyp @@ -3,37 +3,17 @@ # found in the LICENSE file. { + 'variables': { + 'chromium_code': 1, + }, + 'target_defaults': { - 'sources/': [ - ['exclude', '/(cocoa|gtk|win)/'], - ['exclude', '_(cocoa|gtk|linux|mac|posix|win|x)\\.(cc|mm?)$'], - ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], - ], 'conditions': [ ['toolkit_uses_gtk == 1', { - 'sources/': [ - ['include', '/gtk/'], - ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], - ['include', '/(gtk|x11)_[^/]*\\.cc$'], - ], 'include_dirs': [ '<(DEPTH)/third_party/angle/include', ], }], - ['OS=="mac"', {'sources/': [ - ['include', '/cocoa/'], - ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'], - ]}, { # else: OS != "mac" - 'sources/': [ - ['exclude', '\\.mm?$'], - ], - }], - ['OS=="win"', - {'sources/': [ - ['include', '_(win)\\.cc$'], - ['include', '/win/'], - ['include', '/win_[^/]*\\.cc$'], - ]}], ], }, 'targets': [ |