diff options
| author | davidben <davidben@chromium.org> | 2015-10-02 09:46:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 16:47:29 +0000 |
| commit | 9cd4b57584efba6ae7686e1b4689434e73543c96 (patch) | |
| tree | 332895584a1fb755a3bd9b32bde605df88c1c760 /extensions/extensions.gyp | |
| parent | ebf0bc25277c6a656337e442060fc51dfc201048 (diff) | |
| download | chromium_src-9cd4b57584efba6ae7686e1b4689434e73543c96.zip chromium_src-9cd4b57584efba6ae7686e1b4689434e73543c96.tar.gz chromium_src-9cd4b57584efba6ae7686e1b4689434e73543c96.tar.bz2 | |
Fold away the NSS cast_cert_validator.cc path.
All platforms with extensions may assume OpenSSL. This removes the
three-argument form of VerificationResult as it's no longer used.
BUG=519504
Review URL: https://codereview.chromium.org/1365733004
Cr-Commit-Position: refs/heads/master@{#352054}
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 6e807d4..c7976da 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -59,6 +59,7 @@ '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', '../url/url.gyp:url_lib', + '../third_party/boringssl/boringssl.gyp:boringssl', '../third_party/libxml/libxml.gyp:libxml', 'common/api/api.gyp:extensions_api', 'extensions_resources.gyp:extensions_resources', @@ -90,31 +91,6 @@ '<@(extensions_common_sources_nacl)', ], }], - ['use_openssl==1', { - 'sources': [ - '<@(extensions_common_sources_openssl)', - ], - 'dependencies': [ - '../third_party/boringssl/boringssl.gyp:boringssl', - ], - }, { - 'sources': [ - '<@(extensions_common_sources_nonopenssl)' - ], - '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', - ], - }], - ], - }], ], }, { |