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

Unified Diff: build/common.gypi

Issue 11417011: Move werror variable declation to non-conditional block. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 74e88377091117cc82f22df6985e1ab453657649..ca1e32ca6691540cd4e9c09177dca7caa0c2fe85 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -674,6 +674,12 @@
'google_default_client_id%': '<(google_default_client_id)',
'google_default_client_secret%': '<(google_default_client_secret)',
+ # Enable -Werror by default, but put it in a variable so it can
+ # be disabled (e.g. in ~/.gyp/include.gypi on the valgrind builders).
+ # This is needed on all platforms since it is used when building
+ # NaCl untrusted code.
+ 'werror%': '-Werror',
+
# Use system protobuf instead of bundled one.
'use_system_protobuf%': 0,
@@ -2208,10 +2214,7 @@
'conditions': [
['os_posix==1 and OS!="mac" and OS!="ios"', {
'target_defaults': {
- # Enable -Werror by default, but put it in a variable so it can
- # be disabled in ~/.gyp/include.gypi on the valgrind builders.
'variables': {
- 'werror%': '-Werror',
'libraries_for_target%': '',
},
'defines': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698