diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-17 12:14:50 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-17 12:14:50 +0000 |
| commit | b9d3d0028bbef6846b017c3ce8514f012921f65f (patch) | |
| tree | 1667a362918c39ab52c25c9acb63a68751329630 /crypto/crypto.gyp | |
| parent | 236790f7ae982eb6dda025960964a88d4fc538f8 (diff) | |
| download | chromium_src-b9d3d0028bbef6846b017c3ce8514f012921f65f.zip chromium_src-b9d3d0028bbef6846b017c3ce8514f012921f65f.tar.gz chromium_src-b9d3d0028bbef6846b017c3ce8514f012921f65f.tar.bz2 | |
Move *keychain_mac* files to crypto/
This is in preparation for moving password_manager/encryptor* to
crypto/.
This also fixes an ODR violation; mock_keychain_mac.cc was being
compiled in two targets which are linked together.
BUG=118564
TEST=
Review URL: http://codereview.chromium.org/9699112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index ef7b87b..405ad0b 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -157,8 +157,12 @@ 'hmac_nss.cc', 'hmac_openssl.cc', 'hmac_win.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', 'p224_spake.cc', 'p224_spake.h', 'nss_util.cc', |