diff options
| author | davidben <davidben@chromium.org> | 2014-10-31 14:00:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-31 21:00:24 +0000 |
| commit | d1be6eac818a2f9b35973814c9ff1740fdca2863 (patch) | |
| tree | 314448adb447a7032ba08f27f7680f0343c48c16 /extensions/extensions.gyp | |
| parent | 8ddfc1ef844ae617768b6b0cc5642c445a9ea9ff (diff) | |
| download | chromium_src-d1be6eac818a2f9b35973814c9ff1740fdca2863.zip chromium_src-d1be6eac818a2f9b35973814c9ff1740fdca2863.tar.gz chromium_src-d1be6eac818a2f9b35973814c9ff1740fdca2863.tar.bz2 | |
Fix extensions NSS/BoringSSL dependencies
The NSS dependency should be guarded by a use_openssl check. BoringSSL and NSS
cannot be linked together as they define some of the same symbols. Update BUILD.gn
analogously by depending on //crypto:platform.
Also condition nss in build/all.gyp on use_openssl in preparation for
https://codereview.chromium.org/694643002/ which will disable the nss and nspr
targets altogether.
BUG=429021
Review URL: https://codereview.chromium.org/686693004
Cr-Commit-Position: refs/heads/master@{#302325}
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index b4932e7..46a2b69 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -806,21 +806,26 @@ 'sources': [ 'browser/api/cast_channel/cast_auth_util_openssl.cc', ], + 'dependencies': [ + '../third_party/boringssl/boringssl.gyp:boringssl', + ], }, { 'sources': [ # cast_auth_util_nss.cc uses NSS functions. 'browser/api/cast_channel/cast_auth_util_nss.cc', ], - }], - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { - 'dependencies': [ - '../build/linux/system.gyp:ssl', - ], - }], - ['OS == "mac" or OS == "ios" or OS == "win"', { - 'dependencies': [ - '../third_party/nss/nss.gyp:nspr', - '../third_party/nss/nss.gyp:nss', + 'conditions': [ + ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { + 'dependencies': [ + '../build/linux/system.gyp:ssl', + ], + }], + ['OS == "mac" or OS == "ios" or OS == "win"', { + 'dependencies': [ + '../third_party/nss/nss.gyp:nspr', + '../third_party/nss/nss.gyp:nss', + ], + }], ], }], ], |