diff options
| author | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-24 19:31:58 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-24 19:31:58 +0000 |
| commit | a37023fec8f180b86c70609bd67195287d461d52 (patch) | |
| tree | 4a5957dfaa05aee8edc048c3d7b051e679ba47e9 /common.gypi | |
| parent | f5d335e235288474839d7bc3687c5a09e59eaa41 (diff) | |
| download | gyp-a37023fec8f180b86c70609bd67195287d461d52.tar.gz | |
Use a single cros_toolchain tarball for ChromeOS build
It's stored in our GS bucket, so we won't need two sets of credentials.
(SkipBuildbotRuns) since this isn't in use.
Review URL: https://codereview.chromium.org/17608003
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9743 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common.gypi b/common.gypi index 54c14cd..2173d90 100644 --- a/common.gypi +++ b/common.gypi @@ -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': [ |