WAE on Macs too. That leaves only Android framework builds.
authormtklein <mtklein@chromium.org>
Mon, 15 Dec 2014 17:45:00 +0000 (09:45 -0800)
committerCommit bot <commit-bot@chromium.org>
Mon, 15 Dec 2014 17:45:00 +0000 (09:45 -0800)
Will rebase after yours lands.

BUG=skia:

Review URL: https://codereview.chromium.org/804063002

gyp/common_variables.gypi

index 67b40a5..c33defc 100644 (file)
     },
 
     '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