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 | 5bbf1d52609f9a8ead746e3e2cef78e6648f8b65 (patch) | |
| tree | 1345ad5efa067a3e72e9f6f679a37bad88776baa /gyp | |
| parent | a741f7d7b8dff0ac0839724ac2b69f9cbfb33a1e (diff) | |
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@9743 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 54c14cd59a..2173d909d8 100644 --- a/gyp/common.gypi +++ b/gyp/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': [ |