diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 23:47:50 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 23:47:50 +0000 |
| commit | 6c2046560b8154ac140ec85465c60354bde17666 (patch) | |
| tree | 100e7d1b2485b433a504833fea64540f1e751fa0 | |
| parent | 7da01767d03ed6e6c5e8cfafc00b426dc77c4da5 (diff) | |
| download | chromium_src-6c2046560b8154ac140ec85465c60354bde17666.zip chromium_src-6c2046560b8154ac140ec85465c60354bde17666.tar.gz chromium_src-6c2046560b8154ac140ec85465c60354bde17666.tar.bz2 | |
Fix the standalone webkit build.
Ideally this dependency on chrome from net should not exist, but
until that is resolved, we can at least avoid the dependency when
using net.gyp from the standalone webkit build (which lacks a
checkout of chrome/).
R=nick
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1996010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46758 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/net.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index 3b95934..976b3da 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -833,9 +833,7 @@ 'dependencies': [ 'net', '../base/base.gyp:base', - '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', '../testing/gtest.gyp:gtest', - '../third_party/protobuf2/protobuf.gyp:py_proto', ], 'sources': [ 'base/cert_test_util.cc', @@ -850,6 +848,12 @@ 'socket/ssl_test_util.h', ], 'conditions': [ + ['inside_chromium_build==1', { + 'dependencies': [ + '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', + '../third_party/protobuf2/protobuf.gyp:py_proto', + ], + }], ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'dependencies': [ '../build/linux/system.gyp:nss', |