Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Unified Diff: gyp/common_variables.gypi

Issue 804063002: WAE on Macs too. That leaves only Android framework builds. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: mac a different way Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698