diff options
| author | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 13:03:46 +0000 |
|---|---|---|
| committer | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 13:03:46 +0000 |
| commit | 982f1ab97f266866f5ea7cdf7980fb8c2685a713 (patch) | |
| tree | 260c13aad3c10eb298e9d076917ba461a289b971 /crypto/crypto.gyp | |
| parent | 57ed6c2888e68e0baa6919cee16b3c4726552e09 (diff) | |
| download | chromium_src-982f1ab97f266866f5ea7cdf7980fb8c2685a713.zip chromium_src-982f1ab97f266866f5ea7cdf7980fb8c2685a713.tar.gz chromium_src-982f1ab97f266866f5ea7cdf7980fb8c2685a713.tar.bz2 | |
Rename MacKeychain to AppleKeychain
Rename MacKeychain to AppleKeychain and add mac and iOS specific
implementations (crypto/apple_keychain_ios.mm and
crypto/apple_keychain_mac.mm). Rename MockKeychain to
MockAppleKeychain and split its implementations in 3 files
crypto/mock_apple_keychain.cc, crypto/mock_apple_keychain_ios.cc and
crypto/mock_apple_keychain_mac.cc).
Review URL: https://chromiumcodereview.appspot.com/10875029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 40606a7..c9313080 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -65,6 +65,13 @@ 'symmetric_key_win.cc', ], }], + [ 'OS != "mac" and OS != "ios"', { + 'sources!': [ + 'apple_keychain.h', + 'mock_apple_keychain.cc', + 'mock_apple_keychain.h', + ], + }], [ 'OS == "android"', { 'dependencies': [ '../third_party/openssl/openssl.gyp:openssl', @@ -86,6 +93,12 @@ }, }, ], + [ 'OS == "ios"', { + 'sources!': [ + # This class is stubbed out on iOS. + 'rsa_private_key.cc', + ], + }], [ 'OS == "mac"', { 'link_settings': { 'libraries': [ @@ -156,18 +169,13 @@ ], },], ], - 'target_conditions' : [ - [ 'OS == "ios"', { - 'sources!': [ - # This class is stubbed out on iOS. - 'rsa_private_key.cc', - ], - }], - ], 'sources': [ # NOTE: all transitive dependencies of HMAC on windows need # to be placed in the source list above. '<@(hmac_win64_related_sources)', + 'apple_keychain.h', + 'apple_keychain_ios.mm', + 'apple_keychain_mac.mm', 'capi_util.cc', 'capi_util.h', 'crypto_export.h', @@ -188,12 +196,12 @@ 'encryptor_openssl.cc', 'hmac_nss.cc', 'hmac_openssl.cc', - 'keychain_mac.cc', - 'keychain_mac.h', 'mac_security_services_lock.cc', 'mac_security_services_lock.h', - 'mock_keychain_mac.cc', - 'mock_keychain_mac.h', + 'mock_apple_keychain.cc', + 'mock_apple_keychain.h', + 'mock_apple_keychain_ios.cc', + 'mock_apple_keychain_mac.cc', 'p224_spake.cc', 'p224_spake.h', 'nss_util.cc', |