Refactor how clang warning flags are set.

third_party/snappy/snappy.gyp

 # 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': {
     'conditions': [
       # Define an "os_include" variable that points at the OS-specific generated
       # headers.  These were generated by running the configure script offline.
       ['os_posix == 1 and OS != "mac"', {
@@ skipping 12 matching lines @@
         '<(os_include)',
         'src',
         '../..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(os_include)',
           'src',
         ],
       },
+      'variables': {
+        'clang_warning_flags_unset': [
+          # snappy-stubs-internal.h unapologetically has: using namespace std
+          # https://code.google.com/p/snappy/issues/detail?id=70
+          '-Wheader-hygiene',
+        ],
+      },
       'sources': [
         'src/snappy-internal.h',
         'src/snappy-sinksource.cc',
         'src/snappy-sinksource.h',
         'src/snappy-stubs-internal.cc',
         'src/snappy-stubs-internal.h',
         'src/snappy.cc',
         'src/snappy.h',
       ],
       'conditions': [
-        ['clang == 1', {
-          # snappy-stubs-internal.h unapologetically has: using namespace std
-          # https://code.google.com/p/snappy/issues/detail?id=70
-          'xcode_settings': {
-            'WARNING_CFLAGS!': [ '-Wheader-hygiene' ],
-          },
-          'cflags': [ '-Wno-header-hygiene' ],
-        }],
         ['OS=="linux" or OS=="mac"', {
           'defines': [
             # TODO(tfarina): Only Mac and Linux has the generated config.h for
             # now. Generate the config.h for Windows too and enable this there
             # as well.
             'HAVE_CONFIG_H=1',
           ],
         }],
         ['OS=="win"', {
           # Signed/unsigned comparison
@@ skipping 13 matching lines @@
         'src/snappy-test.cc',
         'src/snappy-test.h',
         'src/snappy_unittest.cc',
       ],
       'dependencies': [
         'snappy',
         '../../base/base.gyp:base',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/zlib/zlib.gyp:zlib',
       ],
+      'variables': {
+        'clang_warning_flags': [ 'Wno-return-type' ],

[hans, 2014/08/01 21:23:29]

There's a dash missing here.

[Nico, 2014/08/01 21:25:06]

Hm, so I guess if this still gets green runs, this flag isn't needed? I'll try
removing it.

[Nico, 2014/08/01 21:35:20]

…looks like not bot builds this target. So I added the -, maybe someone uses
this target locally?

+        'clang_warning_flags_unset': [ '-Wheader-hygiene' ],
+      },
       'conditions': [
         ['OS=="linux" or OS=="mac"', {
           'defines': [
             # TODO(tfarina): Only Mac and Linux has the generated config.h for
             # now. Generate the config.h for Windows too and enable this there
             # as well.
             'HAVE_CONFIG_H=1',
           ],
         }],
-        ['clang == 1', {
-          'cflags': [
-            '-Wno-return-type',
-            '-Wno-header-hygiene'
-          ],
-        }],
       ],
     },
   ],
 }