Refactor skia_warnings_as_errors

gyp/libjpeg.gyp

 # Copyright 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.
 
 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified
 # such that all source paths point into that directory.
 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp
 # from Chrome's libjpeg port, rather than making our own copy') for a better
 # long-term solution.
 
@@ skipping 77 matching lines @@
                 '../third_party/externals/libjpeg/jquant2.c',
                 '../third_party/externals/libjpeg/jutils.c',
                 '../third_party/externals/libjpeg/jversion.h',
               ],
               'direct_dependent_settings': {
                 'include_dirs': [
                   '../third_party/externals/libjpeg',
                 ],
               },
               'conditions': [
-                ['OS!="win"', {
+                [ 'skia_os != "win"', {
                   'product_name': 'jpeg',
                   'cflags': [
                    '-Wno-main', # supresses warnings about naming things "main"
                   ],
                 }],
-                ['OS=="android"', {
-                  'cflags!': [
-                   '-fno-rtti', # supresses warnings about invalid option of non-C++ code
-                   '-Wall',
-                   '-Werror',
-                  ],
-                }],
-                ['OS in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
-                  'cflags!': [
-                   '-Werror',
+                # Turn off warnings as errors.
+                [ 'skia_warnings_as_errors', {
+                  'conditions': [
+                    [ 'skia_os == "mac" or skia_os == "ios"', {
+                      'xcode_settings': {
+                        'OTHER_CPLUSPLUSFLAGS!': [
+                          '-Werror',
+                        ]
+                      },
+                    }],
+                    [ 'skia_os == "win"', {
+                      'msvs_settings': {
+                        'VCCLCompilerTool': {
+                          'WarnAsError': 'false',
+                        },
+                      },
+                    }],
+                    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
+                      'cflags!': [
+                        '-Werror',
+                      ],
+                    }],
                   ],
                 }],
               ],
             },
           ],
         }, {
           'targets': [
             {
               'target_name': 'libjpeg',
               'type': 'none',
@@ skipping 13 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: