Index: base/base.gypi |
=================================================================== |
--- base/base.gypi (revision 81350) |
+++ base/base.gypi (working copy) |
@@ -443,22 +443,6 @@ |
}, |
}, |
], |
- [ 'use_openssl==1', { |
- 'dependencies': [ |
- '../third_party/openssl/openssl.gyp:openssl', |
- ], |
- }, { # use_openssl==0 |
- 'sources': [ |
- 'base/crypto/scoped_nss_types.h', |
- ], |
- 'dependencies': [ |
- '../build/linux/system.gyp:nss', |
- ], |
- 'export_dependent_settings': [ |
- '../build/linux/system.gyp:nss', |
- ], |
- } |
- ], |
], |
'dependencies': [ |
'symbolize', |
@@ -512,27 +496,13 @@ |
'$(SDKROOT)/System/Library/Frameworks/Security.framework', |
], |
}, |
- }, { # OS != "mac" |
- 'sources!': [ |
- 'crypto/cssm_init.cc', |
- 'crypto/cssm_init.h', |
- 'crypto/mac_security_services_lock.cc', |
- 'crypto/mac_security_services_lock.h', |
- ], |
}], |
- [ 'OS == "mac" or OS == "win"', { |
- 'dependencies': [ |
- '../third_party/nss/nss.gyp:nss', |
- ], |
- },], |
[ 'OS != "win"', { |
'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], |
'sources!': [ |
'third_party/purify/pure_api.c', |
'base_drag_source.cc', |
'base_drop_target.cc', |
- 'crypto/capi_util.h', |
- 'crypto/capi_util.cc', |
'event_recorder.cc', |
'file_version_info.cc', |
'registry.cc', |
@@ -540,82 +510,11 @@ |
'win_util.cc', |
], |
},], |
- [ 'use_openssl==1', { |
- # TODO(joth): Use a glob to match exclude patterns once the |
- # OpenSSL file set is complete. |
- 'sources!': [ |
- 'crypto/encryptor_nss.cc', |
- 'crypto/rsa_private_key_nss.cc', |
- 'crypto/secure_hash_default.cc', |
- 'crypto/signature_creator_nss.cc', |
- 'crypto/signature_verifier_nss.cc', |
- 'crypto/symmetric_key_nss.cc', |
- 'hmac_nss.cc', |
- 'nss_util.cc', |
- 'nss_util.h', |
- 'third_party/nss/blapi.h', |
- 'third_party/nss/blapit.h', |
- 'third_party/nss/sha256.h', |
- 'third_party/nss/sha512.cc', |
- ], |
- }, { |
- 'sources!': [ |
- 'crypto/encryptor_openssl.cc', |
- 'crypto/rsa_private_key_openssl.cc', |
- 'crypto/secure_hash_openssl.cc', |
- 'crypto/signature_creator_openssl.cc', |
- 'crypto/signature_verifier_openssl.cc', |
- 'crypto/symmetric_key_openssl.cc', |
- 'hmac_openssl.cc', |
- 'openssl_util.cc', |
- 'openssl_util.h', |
- ], |
- },], |
], |
'sources': [ |
- 'crypto/capi_util.cc', |
- 'crypto/capi_util.h', |
- 'crypto/crypto_module_blocking_password_delegate.h', |
- 'crypto/cssm_init.cc', |
- 'crypto/cssm_init.h', |
- 'crypto/encryptor.h', |
- 'crypto/encryptor_mac.cc', |
- 'crypto/encryptor_nss.cc', |
- 'crypto/encryptor_openssl.cc', |
- 'crypto/encryptor_win.cc', |
- 'crypto/mac_security_services_lock.cc', |
- 'crypto/mac_security_services_lock.h', |
- 'crypto/rsa_private_key.h', |
- 'crypto/rsa_private_key.cc', |
- 'crypto/rsa_private_key_mac.cc', |
- 'crypto/rsa_private_key_nss.cc', |
- 'crypto/rsa_private_key_openssl.cc', |
- 'crypto/rsa_private_key_win.cc', |
- 'crypto/secure_hash.h', |
- 'crypto/secure_hash_default.cc', |
- 'crypto/secure_hash_openssl.cc', |
- 'crypto/signature_creator.h', |
- 'crypto/signature_creator_mac.cc', |
- 'crypto/signature_creator_nss.cc', |
- 'crypto/signature_creator_openssl.cc', |
- 'crypto/signature_creator_win.cc', |
- 'crypto/signature_verifier.h', |
- 'crypto/signature_verifier_mac.cc', |
- 'crypto/signature_verifier_nss.cc', |
- 'crypto/signature_verifier_openssl.cc', |
- 'crypto/signature_verifier_win.cc', |
- 'crypto/symmetric_key.h', |
- 'crypto/symmetric_key_mac.cc', |
- 'crypto/symmetric_key_nss.cc', |
- 'crypto/symmetric_key_openssl.cc', |
- 'crypto/symmetric_key_win.cc', |
'third_party/nspr/prcpucfg.h', |
'third_party/nspr/prcpucfg_win.h', |
'third_party/nspr/prtypes.h', |
- 'third_party/nss/blapi.h', |
- 'third_party/nss/blapit.h', |
- 'third_party/nss/sha256.h', |
- 'third_party/nss/sha512.cc', |
'third_party/purify/pure.h', |
'third_party/purify/pure_api.c', |
'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', |
@@ -628,11 +527,6 @@ |
'event_recorder_stubs.cc', |
'file_descriptor_shuffle.cc', |
'file_descriptor_shuffle.h', |
- 'hmac.h', |
- 'hmac_mac.cc', |
- 'hmac_nss.cc', |
- 'hmac_openssl.cc', |
- 'hmac_win.cc', |
'linux_util.cc', |
'linux_util.h', |
'md5.cc', |
@@ -648,12 +542,6 @@ |
'message_pump_mac.mm', |
'metrics/field_trial.cc', |
'metrics/field_trial.h', |
- 'nss_util.cc', |
- 'nss_util.h', |
- 'openssl_util.cc', |
- 'openssl_util.h', |
- 'sha2.cc', |
- 'sha2.h', |
'string16.cc', |
'string16.h', |
'sync_socket.h', |