From d1be6eac818a2f9b35973814c9ff1740fdca2863 Mon Sep 17 00:00:00 2001 From: davidben Date: Fri, 31 Oct 2014 14:00:09 -0700 Subject: 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} --- extensions/extensions.gyp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'extensions/extensions.gyp') 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', + ], + }], ], }], ], -- cgit v1.1