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

Unified Diff: gyp/jsoncpp.gyp

Issue 12963002: Refactor skia_warnings_as_errors (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Fix merge conflicts and trybot failures Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/libjpeg.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/jsoncpp.gyp
===================================================================
--- gyp/jsoncpp.gyp (revision 8270)
+++ gyp/jsoncpp.gyp (working copy)
@@ -47,29 +47,33 @@
],
},
'conditions': [
- [ 'skia_os == "mac"', {
- 'xcode_settings': {
- 'OTHER_CPLUSPLUSFLAGS!': [
- '-Werror',
- ]
- },
- }],
- [ 'skia_os == "win"', {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'WarnAsError': 'false',
- },
- },
- }],
[ 'skia_os == "android"', {
'cflags!': [
'-Wall',
- '-Werror',
],
}],
- ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
- 'cflags!': [
- '-Werror',
+ # Turn off warnings as errors.
djsollen 2013/03/20 19:29:07 What do you think of putting this in a gypi and ca
borenet 2013/03/20 20:02:50 I like it! Done.
+ [ 'skia_warnings_as_errors', {
+ 'conditions': [
+ [ 'skia_os == "mac" or skia_os == "ios"', {
+ 'xcode_settings': {
+ 'OTHER_CPLUSPLUSFLAGS!': [
+ '-Werror',
+ ]
+ },
+ }],
+ [ 'skia_os == "win"', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WarnAsError': 'false',
+ },
+ },
+ }],
+ ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "android"]', {
+ 'cflags!': [
+ '-Werror',
+ ],
+ }],
],
}],
],
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/libjpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698