diff options
| author |  mtklein <mtklein@chromium.org> | 2014-12-15 10:38:42 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-15 10:38:42 -0800 |
| commit | f19ec511b141222c3ee54c9251312fd1ef1eff78 (patch) | |
| tree | 07003c3bb8930fd250697cfa144e2105e048e927 | |
| parent | 616e45194ede358ce7ae96ff9e18986e48c3793c (diff) | |
WAE on Macs too. That leaves only Android framework builds.
Will rebase after yours lands.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/161b6dee11a67e877ef5b339b17775b8e44c5927
Review URL: https://codereview.chromium.org/804063002
| -rw-r--r-- | gyp/common_variables.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 67b40a5999..f89c08b95e 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -161,9 +161,8 @@ }, '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_os in ["mac", "linux", "freebsd", "openbsd", "solaris", "android", "win"] ' + 'and skia_android_framework == 0', { 'skia_warnings_as_errors%': 1, }, { 'skia_warnings_as_errors%': 0, |