diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 18:45:12 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 18:45:12 +0000 |
| commit | 6adc95e84aa4a1fb933f995ad31faafc4a451065 (patch) | |
| tree | 57ff856ef5a0c6ec97c7f6d55df3e07c5e5df19a /crypto/crypto.gyp | |
| parent | dfb86ba4b8d9090ee64e9cc7643fb132ebd20b6f (diff) | |
| download | chromium_src-6adc95e84aa4a1fb933f995ad31faafc4a451065.zip chromium_src-6adc95e84aa4a1fb933f995ad31faafc4a451065.tar.gz chromium_src-6adc95e84aa4a1fb933f995ad31faafc4a451065.tar.bz2 | |
Revert "crypto: enable components build for Linux"
This reverts commit r92188, link failures in skia (!).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index a6df806..53a41ef5 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -9,7 +9,6 @@ 'targets': [ { 'target_name': 'crypto', - 'type': '<(component)', 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto 'dependencies': [ '../base/base.gyp:base', @@ -68,13 +67,16 @@ '../third_party/nss/nss.gyp:nss', ], }], - [ 'OS != "win"', { + [ 'OS == "win"', { + 'type': '<(component)', + }, { # else OS != "win" + 'type': 'static_library', 'sources!': [ 'capi_util.h', 'capi_util.cc', ], }], - [ 'component == "shared_library"', { + [ 'OS == "win" and component == "shared_library"', { 'defines': [ 'CRYPTO_DLL', 'CRYPTO_IMPLEMENTATION', |