diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 14:56:20 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 14:56:20 +0000 |
| commit | bbbe9ad9d404edddefc06ebb745d41c3435751ab (patch) | |
| tree | f5917d991da95ce85e7772ddb15adeb0ab52d420 /net/net.gyp | |
| parent | 52af9bc3801fac7b1b258861716c807790e4e42f (diff) | |
| download | chromium_src-bbbe9ad9d404edddefc06ebb745d41c3435751ab.zip chromium_src-bbbe9ad9d404edddefc06ebb745d41c3435751ab.tar.gz chromium_src-bbbe9ad9d404edddefc06ebb745d41c3435751ab.tar.bz2 | |
Move linux openssl dependency under linux condition
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/4398002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/net/net.gyp b/net/net.gyp index 330881d..44a9f67 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -719,9 +719,6 @@ ], }], ['use_openssl==1', { - 'dependencies': [ - '../build/linux/system.gyp:openssl', - ], 'sources!': [ 'socket/ssl_client_socket_nss.cc', 'socket/ssl_client_socket_nss.h', @@ -740,7 +737,18 @@ 'dependencies': [ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gdk', - '../build/linux/system.gyp:nss', + ], + 'conditions': [ + ['use_openssl==1', { + 'dependencies': [ + '../build/linux/system.gyp:openssl', + ], + }, + { # else use_openssl==0, use NSS + 'dependencies': [ + '../build/linux/system.gyp:nss', + ], + }], ], }, { # else: OS is not in the above list |