Honor werror variable for untrusted builds.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
     # code, as opposed to external code.  This variable is used to control
     # such things as the set of warnings to enable, and whether warnings are
     # treated as errors.
@@ skipping 82 matching lines @@
         # or you can add the following line (without the #) to
         # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
         # to compile as shared by default
         'library%': 'static_library',
       },
       'nacl_standalone%': '<(nacl_standalone)',
       # Define branding and buildtype on the basis of their settings within the
       # variables sub-dict above, unless overridden.
       'branding%': '<(branding)',
       'buildtype%': '<(buildtype)',
+
+      # Enable -Werror by default, but put it in a variable so it can
+      # be disabled (e.g. in ~/.gyp/include.gypi).
+      'werror%': '-Werror',
+

[Sam Clegg, 2012/11/15 19:21:05]

Moving werror out of linux only block as it is now needed on all platforms (or
at least on all platforms that build nexes).

       # Compute the architecture that we're building for. Default to the
       # architecture that we're building on.
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           # This handles the Linux platforms we generally deal with. Anything
           # else gets passed through, which probably won't work very well; such
           # hosts should pass an explicit target_arch to gyp.
           #
           # NOTE: currently only nacl is generating gyp files on an arm board.
           #     The arm.* -> arm substitution in chrome's common.gypi isn't
@@ skipping 150 matching lines @@
         'cflags!': [
           # Clang doesn't seem to know know this flag.
           '-mfpmath=sse',
         ],
       }],
     ],
   },
   'conditions': [
     ['OS=="linux"', {
       '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': {
+          # Enable -Werror by default, but put it in a variable so it can
+          # be disabled (e.g. in ~/.gyp/include.gypi).
           'werror%': '-Werror',
         },
         'cflags': [
            '<(werror)',  # See note above about the werror variable.
            '-pthread',
           '-fno-exceptions',
           '-Wall', # TODO(bradnelson): why does this disappear?!?
         ],
         'conditions': [
           ['nacl_standalone==1 and OS=="linux"', {
@@ skipping 566 matching lines @@
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
   'includes': [
     'untrusted.gypi',
   ],
 }