diff options
author | 2014-12-15 09:45:00 -0800 | |
---|---|---|
committer | 2014-12-15 09:45:00 -0800 | |
commit | 161b6dee11a67e877ef5b339b17775b8e44c5927 (patch) | |
tree | 15d3f7ea8ae9ca606d6a416586d9d0a1c991c307 /gyp/common_variables.gypi | |
parent | 8fb09548ec5aea3f4c8a57edc80c40e924b7a8d2 (diff) |
WAE on Macs too. That leaves only Android framework builds.
Will rebase after yours lands.
BUG=skia:
Review URL: https://codereview.chromium.org/804063002
Diffstat (limited to 'gyp/common_variables.gypi')
-rw-r--r-- | gyp/common_variables.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 67b40a5999..c33defcc03 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 |