Refactor skia_warnings_as_errors

gyp/utils.gyp

 {
   'targets': [
     {
       'target_name': 'utils',
       'product_name': 'skia_utils',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
-        'cityhash',
+        'cityhash.gyp:cityhash',
       ],
       'include_dirs': [
         '../include/config',
         '../include/core',
         '../include/effects',
         '../include/pipe',
         '../include/utils',
         '../include/utils/mac',
         '../include/utils/unix',
         '../include/utils/win',
@@ skipping 177 matching lines @@
           'sources!': [
             '../src/utils/SkThreadUtils_pthread_linux.cpp',
             '../src/utils/SkCityHash.cpp',
             '../src/utils/SkCityHash.h',
           ],
           'dependencies!': [
             # CityHash is not supported on NaCl because the NaCl toolchain is
             # missing byteswap.h which is needed by CityHash.
             # TODO(borenet): Find a way to either provide this dependency or
             # replace it.
-            'cityhash',
+            'cityhash.gyp:cityhash',
           ],
         }],
         [ 'skia_os == "android"', {
           'sources': [
             '../src/utils/android/ashmem.cpp',
           ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/utils',
         ],
       },
     },
-    {
-      'target_name': 'cityhash',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'include_dirs': [
-        '../include/config',
-        '../include/core',
-        '../src/utils/cityhash',
-        '../third_party/externals/cityhash/src',
-      ],
-      'sources': [
-        '../third_party/externals/cityhash/src/city.cc',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/cityhash/src',
-        ],
-      },
-      'conditions': [
-        [ 'skia_os == "mac"', {
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS!': [
-              '-Werror',
-            ]
-          },
-        }],
-        [ 'skia_os == "win"', {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'WarnAsError': 'false',
-            },
-          },
-        }],
-        [ 'skia_os == "android"', {
-          'cflags!': [
-            '-Wall',
-            '-Werror',
-          ],
-        }],
-        ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
-          'cflags!': [
-            '-Werror',
-          ],
-        }],
-      ],
-    },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: