Refactor skia_warnings_as_errors

gyp/utils.gyp

Index: gyp/utils.gyp
===================================================================
--- gyp/utils.gyp	(revision 8310)
+++ gyp/utils.gyp	(working copy)
@@ -6,7 +6,7 @@
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
-        'cityhash',
+        'cityhash.gyp:cityhash',
       ],
       'include_dirs': [
         '../include/config',
@@ -204,7 +204,7 @@
             # 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"', {
@@ -219,52 +219,6 @@
         ],
       },
     },
-    {
-      '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',
-          ],
-        }],
-      ],
-    },
   ],
 }