| Index: gyp/common_variables.gypi
|
| diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
|
| index 67b40a599947caeb5d5a7d03867a1c7ce73ca222..f89c08b95e2f5a6879f43b4577c1fac67c4a5687 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,
|
|
|