Refactor skia_warnings_as_errors

gyp/utils.gyp

Index: gyp/utils.gyp
===================================================================
--- gyp/utils.gyp	(revision 8147)
+++ gyp/utils.gyp	(working copy)
@@ -238,29 +238,33 @@
         ],
       },
       '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',
+        # Turn off warnings as errors.
+        [ 'skia_warnings_as_errors', {
+          'conditions': [
+            [ 'skia_os == "mac"', {
+              'xcode_settings': {
+                'OTHER_CPLUSPLUSFLAGS!': [
+                  '-Werror',
+                ]
+              },
+            }],
+            [ 'skia_os == "win"', {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WarnAsError': 'false',
+                },
+              },
+            }],
+            [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "android"]', {
+              'cflags!': [
+                '-Werror',
+              ],
+            }],
           ],
         }],
       ],