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

Unified Diff: gyp/common.gypi

Issue 17608003: Use a single cros_toolchain tarball for ChromeOS build (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 6 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 | « no previous file | platform_tools/chromeos/bin/chromeos_make » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common.gypi
===================================================================
--- gyp/common.gypi (revision 9724)
+++ gyp/common.gypi (working copy)
@@ -22,7 +22,8 @@
'variables': {
'conditions': [
[ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \
- (skia_os == "nacl" and OS == "linux"))', {
+ (skia_os == "nacl" and OS == "linux") or \
+ (skia_os == "chromeos" and OS == "linux"))', {
'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))',
}],
[ 'skia_mesa and skia_os not in ["mac", "linux"]', {
@@ -40,9 +41,6 @@
[ 'skia_os == "chromeos" and OS != "linux"', {
'error': '<!(Skia ChromeOS build is only supported on Linux.)',
}],
- [ 'skia_os == "chromeos" and not skia_cros_target', {
- 'error': '<!(skia_cros_target must be defined for ChromeOS)',
- }],
],
},
'includes': [
« no previous file with comments | « no previous file | platform_tools/chromeos/bin/chromeos_make » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698