| 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',
|
| + ]
|
| + }],
|
| ],
|
| },
|
| {
|
|
|