Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Unified Diff: net/net.gyp

Issue 4799003: Simplify gyp files by adding a global glob for openssl/nss (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/common.gypi ('K') | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index a2aff3bf871c70472945521c274909cc1c53e442..e983ff135f9d6cfff4d7cd1fd7d3bc9efb6bf047 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -266,13 +266,8 @@
],
[ 'use_openssl==1', {
'sources!': [
- 'base/cert_database_nss.cc',
'base/dnssec_keyset.cc',
'base/dnssec_keyset.h',
- 'base/keygen_handler_nss.cc',
- 'base/nss_memio.c',
- 'base/nss_memio.h',
- 'base/x509_certificate_nss.cc',
'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
'third_party/mozilla_security_manager/nsKeygenHandler.h',
'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
@@ -283,17 +278,6 @@
'third_party/mozilla_security_manager/nsPKCS12Blob.h',
],
},
- { # else: not using openssl.
- 'sources!': [
- 'base/cert_database_openssl.cc',
- 'base/keygen_handler_openssl.cc',
- 'base/openssl_util.cc',
- 'base/openssl_util.h',
- 'base/x509_certificate_openssl.cc',
- 'base/x509_openssl_util.cc',
- 'base/x509_openssl_util.h',
- ],
- },
],
[ 'OS == "win"', {
'dependencies': [
@@ -724,20 +708,8 @@
}],
['use_openssl==1', {
'sources!': [
- 'ocsp/nss_ocsp.cc',
- 'ocsp/nss_ocsp.h',
'socket/dns_cert_provenance_check.cc',
'socket/dns_cert_provenance_check.h',
- 'socket/ssl_client_socket_nss.cc',
- 'socket/ssl_client_socket_nss.h',
- 'socket/ssl_client_socket_nss_factory.cc',
- 'socket/ssl_client_socket_nss_factory.h',
- ],
- },
- { # else !use_openssl: remove the unneeded files
- 'sources!': [
- 'socket/ssl_client_socket_openssl.cc',
- 'socket/ssl_client_socket_openssl.h',
],
},
],
« build/common.gypi ('K') | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698