diff options
| author |  mtklein <mtklein@google.com> | 2014-12-15 09:49:12 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-15 09:49:12 -0800 |
| commit | 616e45194ede358ce7ae96ff9e18986e48c3793c (patch) | |
| tree | b61abff6ed0d0cbb049506d4d80fa43e7c81cf96 /gyp | |
| parent | 161b6dee11a67e877ef5b339b17775b8e44c5927 (diff) | |
Revert of WAE on Macs too. That leaves only Android framework builds. (patchset #3 id:40001 of https://codereview.chromium.org/804063002/)
Reason for revert:
Forgot CrOS and NaCl builds.
Original issue's description:
> WAE on Macs too. That leaves only Android framework builds.
>
> Will rebase after yours lands.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/161b6dee11a67e877ef5b339b17775b8e44c5927
TBR=bsalomon@google.com,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/805043002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index c33defcc03..67b40a5999 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -161,10 +161,12 @@ }, 'conditions': [ - [ 'skia_android_framework', { - 'skia_warnings_as_errors%': 0, - }, { + [ '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, }], # This variable allows the user to customize the optimization level used |