diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 01:36:45 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 01:36:45 +0000 |
| commit | e3ff8ee22b683f1b7753a2246265e393e9b0ad44 (patch) | |
| tree | 6b2721d7c488e63b4311d5cc4d610d19afabda1f /crypto/crypto.gyp | |
| parent | 8178dddb833bfdf62ba646d50a3eb62f05b68783 (diff) | |
| download | chromium_src-e3ff8ee22b683f1b7753a2246265e393e9b0ad44.zip chromium_src-e3ff8ee22b683f1b7753a2246265e393e9b0ad44.tar.gz chromium_src-e3ff8ee22b683f1b7753a2246265e393e9b0ad44.tar.bz2 | |
Rename crypto/third_party/nss headers to avoid mixups.
When trying to include the real NSS headers from other files under
crypto/third_party/nss, the local versions would get used on the MSVS
build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8538025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 3f1b4ba..3a56631 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -93,11 +93,11 @@ 'signature_creator_nss.cc', 'signature_verifier_nss.cc', 'symmetric_key_nss.cc', - 'third_party/nss/blapi.h', - 'third_party/nss/blapit.h', + 'third_party/nss/chromium-blapi.h', + 'third_party/nss/chromium-blapit.h', 'third_party/nss/chromium-nss.h', + 'third_party/nss/chromium-sha256.h', 'third_party/nss/pk11akey.cc', - 'third_party/nss/sha256.h', 'third_party/nss/sha512.cc', ], }, { @@ -178,11 +178,11 @@ 'symmetric_key_nss.cc', 'symmetric_key_openssl.cc', 'symmetric_key_win.cc', - 'third_party/nss/blapi.h', - 'third_party/nss/blapit.h', + 'third_party/nss/chromium-blapi.h', + 'third_party/nss/chromium-blapit.h', 'third_party/nss/chromium-nss.h', + 'third_party/nss/chromium-sha256.h', 'third_party/nss/pk11akey.cc', - 'third_party/nss/sha256.h', 'third_party/nss/sha512.cc', ], }, |