diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:18:54 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:18:54 +0000 |
commit | 3581bac6e34de899951df84bbe8a4aeaf4735917 (patch) | |
tree | 8c51d24b61b290c10d681f933a12e623f34412c6 /crypto/crypto.gyp | |
parent | 2d0674e16c0b1a6d0947e419f4264997fd1932fc (diff) | |
download | chromium_src-3581bac6e34de899951df84bbe8a4aeaf4735917.zip chromium_src-3581bac6e34de899951df84bbe8a4aeaf4735917.tar.gz chromium_src-3581bac6e34de899951df84bbe8a4aeaf4735917.tar.bz2 |
crypto: enable components build for Linux
Expose some more API via CRYPTO_API and refactor gyp file.
(Reland of r92188.)
Review URL: http://codereview.chromium.org/7336009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
-rw-r--r-- | crypto/crypto.gyp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 53a41ef5..a6df806 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -9,6 +9,7 @@ 'targets': [ { 'target_name': 'crypto', + 'type': '<(component)', 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto 'dependencies': [ '../base/base.gyp:base', @@ -67,16 +68,13 @@ '../third_party/nss/nss.gyp:nss', ], }], - [ 'OS == "win"', { - 'type': '<(component)', - }, { # else OS != "win" - 'type': 'static_library', + [ 'OS != "win"', { 'sources!': [ 'capi_util.h', 'capi_util.cc', ], }], - [ 'OS == "win" and component == "shared_library"', { + [ 'component == "shared_library"', { 'defines': [ 'CRYPTO_DLL', 'CRYPTO_IMPLEMENTATION', |