From 6c2046560b8154ac140ec85465c60354bde17666 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Fri, 7 May 2010 23:47:50 +0000 Subject: 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 --- net/net.gyp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'net/net.gyp') 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', -- cgit v1.1