diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 08:19:28 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 08:19:28 +0000 |
| commit | 699d6248ec0121a5513378ec4875492d9f91ca97 (patch) | |
| tree | 5fc1173f7b378784f387b9778211af453c71bf9d /crypto | |
| parent | 785df74a997943076bbb68bf7dc8fba9f4347e44 (diff) | |
| download | chromium_src-699d6248ec0121a5513378ec4875492d9f91ca97.zip chromium_src-699d6248ec0121a5513378ec4875492d9f91ca97.tar.gz chromium_src-699d6248ec0121a5513378ec4875492d9f91ca97.tar.bz2 | |
Revert "Add COMPONENT_BUILD global define. "
The change broke compilation on Linux Builder (dbg)(shared):
http://build.chromium.org/p/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/3365/steps/compile/logs/stdio
TBR=darin
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7352014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 6 | ||||
| -rw-r--r-- | crypto/crypto_api.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index f660e4cd..a6df806 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -76,8 +76,14 @@ }], [ 'component == "shared_library"', { 'defines': [ + 'CRYPTO_DLL', 'CRYPTO_IMPLEMENTATION', ], + 'direct_dependent_settings': { + 'defines': [ + 'CRYPTO_DLL', + ], + }, }], [ 'use_openssl==1', { # TODO(joth): Use a glob to match exclude patterns once the diff --git a/crypto/crypto_api.h b/crypto/crypto_api.h index 2787af8..b8af452 100644 --- a/crypto/crypto_api.h +++ b/crypto/crypto_api.h @@ -6,7 +6,7 @@ #define CRYPTO_CRYPTO_API_H_ #pragma once -#if defined(COMPONENT_BUILD) +#if defined(CRYPTO_DLL) #if defined(WIN32) #if defined(CRYPTO_IMPLEMENTATION) @@ -19,7 +19,7 @@ #define CRYPTO_API __attribute__((visibility("default"))) #endif -#else // defined(COMPONENT_BUILD) +#else // defined(CRYPTO_DLL) #define CRYPTO_API #endif |