Update several clang warnings after r287092.

third_party/mesa/mesa_gensrc.gypi

 # Copyright (c) 2013 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': {
     'xmlfiles': [
       'src/src/mapi/glapi/gen/EXT_draw_buffers2.xml',
       'src/src/mapi/glapi/gen/NV_texture_barrier.xml',
       'src/src/mapi/glapi/gen/NV_primitive_restart.xml',
@@ skipping 83 matching lines @@
         '<(generated_src_dir)/mesa/',
         '<(generated_src_dir)/mesa/main',
         '<(generated_src_dir)/mesa/program',
         '<(generated_src_dir)/mesa/glapi',
       ],
       'dependencies': [
         'generate_main_mesa_sources',
         'mesa_headers',
         'mesa_libglslcommon', # implicit dependency on generate_main_mesa_sources
       ],
+      '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': [
         'src/src/mesa/program/hash_table.c',
         'src/src/mesa/program/symbol_table.c',
         'src/src/glsl/standalone_scaffolding.cpp',
         'src/src/glsl/main.cpp',
         'src/src/glsl/builtin_stubs.cpp',
       ],
-      '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': [
-            '-Wtautological-constant-out-of-range-compare',
-          ],
-          'cflags!': [
-            '-Wstring-conversion',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'generate_mesa_sources',
       'type': 'none',
       'dependencies': [
         'mesa_builtin_compiler',
       ],
       'actions': [
         {
           'action_name': 'generateBuiltins',
@@ skipping 487 matching lines @@
             'python',
             'generate_git_sha1.py',
             '<(generated_src_dir)/mesa/git_sha1.h',
           ],
           'message': "Generating Mesa sources ...",
         },
       ],
     },
   ],
 }