Refactor how clang warning flags are set.

third_party/mesa/mesa.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': {
     'generated_src_dir': 'src/chromium_gensrc',
   },
   'target_defaults': {
     'defines': [
@@ skipping 111 matching lines @@
         '<(generated_src_dir)/mesa/glapi',
       ],
       'dependencies': [
         'mesa_headers',
       ],
       # TODO(scottmg): http://crbug.com/143877 These should be removed if
       # Mesa is ever rolled and the warnings are fixed.
       'msvs_disabled_warnings': [
           4005, 4018, 4065, 4090, 4099, 4273, 4291, 4345, 4267,
       ],
+      'variables': {
+        'clang_warning_flags': [
+          '-Wno-tautological-constant-out-of-range-compare',
+        ],
+        'clang_warning_flags_unset': [
+          # Don't warn about string->bool used in asserts.
+          '-Wstring-conversion',
+        ],
+      },
       'sources': [
         '<(generated_src_dir)/mesa/main/dispatch.h',
         'src/src/glsl/ast_expr.cpp',
         'src/src/glsl/ast_function.cpp',
         'src/src/glsl/ast_to_hir.cpp',
         'src/src/glsl/ast_type.cpp',
         'src/src/glsl/builtin_variables.cpp',
         '<(generated_src_dir)/mesa/glcpp-lex.c',
         '<(generated_src_dir)/mesa/glcpp-parse.c',
         '<(generated_src_dir)/mesa/glcpp-parse.h',
@@ skipping 81 matching lines @@
         'src/src/glsl/ralloc.h',
         'src/src/glsl/s_expression.cpp',
         'src/src/glsl/s_expression.h',
         # This file is not needed and has duplicate symbols (although it
         # happens to link because of static library link ordering).
         #'src/src/glsl/standalone_scaffolding.cpp',
         #'src/src/glsl/standalone_scaffolding.h',
         'src/src/glsl/strtod.c',
         'src/src/glsl/strtod.h',
       ],
-      'conditions': [
-        ['clang == 1', {
-          'xcode_settings': {
-            'WARNING_CFLAGS': [
-              '-Wno-tautological-constant-out-of-range-compare',
-            ],
-            'WARNING_CFLAGS!': [
-              # Don't warn about string->bool used in asserts.
-              '-Wstring-conversion',
-            ],
-          },
-          'cflags': [
-            '-Wno-tautological-constant-out-of-range-compare',
-          ],
-          'cflags!': [
-            '-Wstring-conversion',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'mesa',
       'type': 'static_library',
       'include_dirs': [
         'src/src/gallium/auxiliary',
         'src/src/gallium/include',
         'src/src/glsl',
         'src/src/glsl/glcpp',
         'src/src/mapi',
@@ skipping 486 matching lines @@
                 '<(PRODUCT_DIR)/libosmesa.so',
                 '<(SHARED_LIB_DIR)/libosmesa.so',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }