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

gyp/common_variables.gypi

 # Copyright 2012 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 143 matching lines @@
       'skia_opencl%': 0,
       'skia_force_distance_field_text%': 0,
 
       # These variables determine the default optimization level for different
       # compilers.
       'skia_default_vs_optimization_level': 3, # full (/Ox)
       'skia_default_gcc_optimization_level': 3, # -O3
     },
 
     '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
       # by the compiler.  The user should be aware that this has different
       # meanings for different compilers and should exercise caution when
       # overriding it.
       [ 'skia_os == "win"', {
         'skia_release_optimization_level%': '<(skia_default_vs_optimization_level)',
       }, {
         'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)',
@@ skipping 59 matching lines @@
     'skia_moz2d%': 0,
     'skia_is_bot%': '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)")',
     'skia_egl%': '<(skia_egl)',
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }