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

Unified Diff: net/net.gyp

Issue 3565006: Decouples certificates viewers from NSS to prepare support for OpenSSL. (Closed)
Patch Set: Comments / ProcessIDN Created 10 years, 2 months 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
« no previous file with comments | « net/base/cert_type.h ('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 9fccc53e50431390d6a29ed90fd04724ec8da315..c4cef18da2b130ed52302f852794d4a25aeabdad 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -666,7 +666,13 @@
['use_openssl==1 and OS == "linux"', {
'dependencies': [
'../build/linux/system.gyp:openssl',
- ]
+ ],
+ 'sources!': [
+ '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!': [
@@ -917,7 +923,7 @@
],
}
],
- ['OS == "linux"', {
+ [ 'OS == "linux"', {
'conditions': [
['linux_use_tcmalloc==1', {
'dependencies': [
@@ -926,6 +932,14 @@
}],
],
}],
+ [ 'use_openssl == 1 and OS == "linux"', {
+ # When building for OpenSSL, we need to exclude some NSS files.
+ # TODO(bulach): remove once we fully support OpenSSL.
+ 'sources!': [
+ 'base/cert_database_nss_unittest.cc',
+ ],
+ },
+ ],
[ 'OS == "win"', {
'sources!': [
'http/http_auth_gssapi_posix_unittest.cc',
@@ -1065,6 +1079,11 @@
}],
],
}],
+ ['use_openssl==1 and OS == "linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:openssl',
+ ]
+ }],
],
},
{
« no previous file with comments | « net/base/cert_type.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698