Revert of WAE on Macs too. That leaves only Android framework builds.

gyp/common_variables.gypi

Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index c33defcc037c516defaec009e83f19d2afeee621..67b40a599947caeb5d5a7d03867a1c7ce73ca222 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -161,10 +161,12 @@
     },
 
     'conditions': [
-      [ 'skia_android_framework', {
+      [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "win"] '
+            'and skia_android_framework == 0 or '
+        'skia_os == "mac" and skia_arch_width == 32', {
+        'skia_warnings_as_errors%': 1,
+      }, {
         'skia_warnings_as_errors%': 0,
-      }, {
-        'skia_warnings_as_errors%': 1,
       }],
 
       # This variable allows the user to customize the optimization level used