diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 67b40a5..c33defc 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -161,12 +161,10 @@
     },
 
     'conditions': [
-      [ '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_android_framework', {
         'skia_warnings_as_errors%': 0,
+      }, {
+        'skia_warnings_as_errors%': 1,
       }],
 
       # This variable allows the user to customize the optimization level used