diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 10:43:45 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 10:43:45 +0000 |
| commit | 3ddfe4812377f6a206b49a8762d61fde0b6185d5 (patch) | |
| tree | 530316f8c671181750e2e7c93522811fb5d63bd6 /chrome/chrome_common.gypi | |
| parent | 26c8600816ecb7906cbacb8e5dabe9980c6b7df5 (diff) | |
| download | chromium_src-3ddfe4812377f6a206b49a8762d61fde0b6185d5.zip chromium_src-3ddfe4812377f6a206b49a8762d61fde0b6185d5.tar.gz chromium_src-3ddfe4812377f6a206b49a8762d61fde0b6185d5.tar.bz2 | |
Fixes OpenSSL support for chrome:common_net:
Adds dependency to OpenSSL libraries.
BUG=None
TEST=Links with use_openssl=1
Review URL: http://codereview.chromium.org/4096013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index d4ca5b6..4c17aaf 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -473,8 +473,18 @@ ], 'conditions': [ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { - 'dependencies': [ - '../build/linux/system.gyp:nss', + 'conditions': [ + ['use_openssl==1', { + 'dependencies': [ + '../build/linux/system.gyp:openssl', + ], + }, + { # else !use_openssl + 'dependencies': [ + '../build/linux/system.gyp:nss', + ], + }, + ], ], }, { # else: OS is not in the above list |