Refactor skia_warnings_as_errors

gyp/common_variables.gypi

Index: gyp/common_variables.gypi
===================================================================
--- gyp/common_variables.gypi	(revision 8147)
+++ gyp/common_variables.gypi	(working copy)
@@ -89,12 +89,27 @@
       'skia_gpu%': 1,
       'skia_osx_sdkroot%': '',
       'skia_profile_enabled%': 0,
-      # Note: This is currently only turned on for linux and android.
-      # TODO: Turn on for Win and Mac as well.
-      'skia_warnings_as_errors%': 0,
       'skia_win_debuggers_path%': '',
     },
 
+    'conditions': [
+      [ 'skia_os == "win" and skia_arch_width == 32 and not skia_angle', {
+        'skia_warnings_as_errors%': 1,
+      }],
+      [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {

[djsollen, 2013/03/20 17:43:29]

why not put android and ios in this list?

[borenet, 2013/03/20 19:19:34]

Combined into one condition.  It was necessary for the "else" condition, which
would have been very complicated otherwise.

+        'skia_warnings_as_errors%': 1,
+      }],
+      [ 'skia_os == "android"', {
+        'skia_warnings_as_errors%': 1,
+      }],
+      [ 'skia_os == "mac" and skia_arch_width == 32', {
+        'skia_warnings_as_errors%': 1,
+      }],
+      [ 'skia_os == "ios"', {
+        'skia_warnings_as_errors%': 1,
+      }],
+    ],
+
     # Re-define all variables defined within the level-2 'variables' dict,
     # so that siblings of the level-1 'variables' dict can see them.
     'armv7%': '<(armv7)',