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

Unified Diff: gyp/common.gypi

Issue 1926163002: Delete ChromeOS code (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months 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 | « gyp/codec.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common.gypi
diff --git a/gyp/common.gypi b/gyp/common.gypi
index ae6dd628cc2fb268e0aad9066b940f984a3bbf19..5aaa58ff0eee5256351492e38f2882bb308ec4f8 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -26,8 +26,7 @@
# situations, like building for iOS on a Mac.
'variables': {
'conditions': [
- [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \
- (skia_os == "chromeos" and OS == "linux"))', {
+ [ 'skia_os != OS and not (skia_os == "ios" and OS == "mac")', {
'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))',
}],
[ 'skia_mesa and skia_os not in ["mac", "linux"]', {
@@ -36,9 +35,6 @@
[ 'skia_angle and not (skia_os == "win" or skia_os == "linux" or skia_os == "mac")', {
'error': '<!(skia_angle=1 only supported with skia_os="win" or skia_os="linux" or skia_os="mac".)',
}],
- [ 'skia_os == "chromeos" and OS != "linux"', {
- 'error': '<!(Skia ChromeOS build is only supported on Linux.)',
- }],
],
},
'includes': [
« no previous file with comments | « gyp/codec.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698