Update clang warnings after r287092.

icu.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.
 
 {
   'includes': [
     'icu.gypi',
   ],
   'variables': {
     'use_system_icu%': 0,
@@ skipping 168 matching lines @@
             'U_I18N_IMPLEMENTATION',
           ],
           'dependencies': [
             'icuuc',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'source/i18n',
             ],
           },
+          'variables': {
+            'clang_warning_flags': [
+              # ICU uses its own deprecated functions.
+              '-Wno-deprecated-declarations',
+              # ICU prefers `a && b || c` over `(a && b) || c`.
+              '-Wno-logical-op-parentheses',
+              # ICU has some `unsigned < 0` checks.
+              '-Wno-tautological-compare',
+              # Looks like a real issue, see http://crbug.com/114660
+              '-Wno-return-type-c-linkage',
+            ],
+          },
           # Since ICU wants to internally use its own deprecated APIs, don't
           # complain about it.
           'cflags': [
             '-Wno-deprecated-declarations',
           ],
           'cflags_cc': [
             '-frtti',
           ],
           'xcode_settings': {
             'GCC_ENABLE_CPP_RTTI': 'YES',       # -frtti
           },
           'msvs_settings': {
             'VCCLCompilerTool': {
               'RuntimeTypeInfo': 'true',
             },
           },
           'conditions': [
             [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
             [ 'use_system_icu==0 and want_separate_host_toolset==0', {
               'toolsets': ['target'],
             }],
-            ['clang==1', {
-              'xcode_settings': {
-                'WARNING_CFLAGS': [
-                  # ICU uses its own deprecated functions.
-                  '-Wno-deprecated-declarations',
-                  # ICU prefers `a && b || c` over `(a && b) || c`.
-                  '-Wno-logical-op-parentheses',
-                  # ICU has some `unsigned < 0` checks.
-                  '-Wno-tautological-compare',
-                  # Looks like a real issue, see http://crbug.com/114660
-                  '-Wno-return-type-c-linkage',
-                ],
-              },
-              'cflags': [
-                '-Wno-deprecated-declarations',
-                '-Wno-logical-op-parentheses',
-                '-Wno-tautological-compare',
-                '-Wno-return-type-c-linkage',
-              ],
-            }],
             ['OS == "android" and clang==0', {
                 # Disable sincos() optimization to avoid a linker error since
                 # Android's math library doesn't have sincos().  Either
                 # -fno-builtin-sin or -fno-builtin-cos works.
                 'cflags': [
                     '-fno-builtin-sin',
                 ],
             }],
             ['OS == "android" and use_system_stlport == 1', {
               'target_conditions': [
@@ skipping 30 matching lines @@
               'source/common',
             ],
             'conditions': [
               [ 'component=="static_library"', {
                 'defines': [
                   'U_STATIC_IMPLEMENTATION',
                 ],
               }],
             ],
           },
+          'variables': {
+            'clang_warning_flags': [
+              # ICU uses its own deprecated functions.
+              '-Wno-deprecated-declarations',
+              # ICU prefers `a && b || c` over `(a && b) || c`.
+              '-Wno-logical-op-parentheses',
+              # ICU has some `unsigned < 0` checks.
+              '-Wno-tautological-compare',
+              # uresdata.c has switch(RES_GET_TYPE(x)) code. The
+              # RES_GET_TYPE macro returns an UResType enum, but some switch
+              # statement contains case values that aren't part of that
+              # enum (e.g. URES_TABLE32 which is in UResInternalType). This
+              # is on purpose.
+              '-Wno-switch',
+            ],
+          },
           'cflags': [
             # Since ICU wants to internally use its own deprecated APIs,
             # don't complain about it.
             '-Wno-deprecated-declarations',
             '-Wno-unused-function',
           ],
           'cflags_cc': [
             '-frtti',
           ],
           'xcode_settings': {
@@ skipping 37 matching lines @@
                     '<(android_src)/abi/cpp/include',
                   ],
                   'link_settings': {
                     'libraries': [
                       '-lgabi++',
                     ],
                   },
                 }],
               ],
             }],
-            ['clang==1', {
-              'xcode_settings': {
-                'WARNING_CFLAGS': [
-                  # ICU uses its own deprecated functions.
-                  '-Wno-deprecated-declarations',
-                  # ICU prefers `a && b || c` over `(a && b) || c`.
-                  '-Wno-logical-op-parentheses',
-                  # ICU has some `unsigned < 0` checks.
-                  '-Wno-tautological-compare',
-                  # uresdata.c has switch(RES_GET_TYPE(x)) code. The
-                  # RES_GET_TYPE macro returns an UResType enum, but some switch
-                  # statement contains case values that aren't part of that
-                  # enum (e.g. URES_TABLE32 which is in UResInternalType). This
-                  # is on purpose.
-                  '-Wno-switch',
-                ],
-              },
-              'cflags': [
-                '-Wno-deprecated-declarations',
-                '-Wno-logical-op-parentheses',
-                '-Wno-tautological-compare',
-                '-Wno-switch',
-              ],
-            }],
           ], # conditions
         },
       ], # targets
     }],
     ['use_system_icu==1', {
       'targets': [
         {
           'target_name': 'system_icu',
           'type': 'none',
           'conditions': [
@@ skipping 235 matching lines @@
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
       ], # targets
     }],
   ], # conditions
 }