diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /net/net.gyp | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 46 |
1 files changed, 42 insertions, 4 deletions
diff --git a/net/net.gyp b/net/net.gyp index 083aac4..b9e3776 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -142,8 +142,6 @@ 'base/network_config_watcher_mac.h', 'base/nss_memio.c', 'base/nss_memio.h', - 'base/openssl_util.cc', - 'base/openssl_util.h', 'base/pem_tokenizer.cc', 'base/pem_tokenizer.h', 'base/platform_mime_util.h', @@ -287,8 +285,6 @@ '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', @@ -610,6 +606,8 @@ 'socket/ssl_client_socket_pool.h', 'socket/ssl_client_socket_win.cc', 'socket/ssl_client_socket_win.h', + 'socket/ssl_error_params.cc', + 'socket/ssl_error_params.h', 'socket/tcp_client_socket.cc', 'socket/tcp_client_socket.h', 'socket/tcp_client_socket_libevent.cc', @@ -722,6 +720,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', @@ -863,6 +863,7 @@ 'base/upload_data_stream_unittest.cc', 'base/x509_certificate_unittest.cc', 'base/x509_cert_types_unittest.cc', + 'base/x509_openssl_util_unittest.cc', 'disk_cache/addr_unittest.cc', 'disk_cache/backend_unittest.cc', 'disk_cache/bitmap_unittest.cc', @@ -967,6 +968,7 @@ 'websockets/websocket_handshake_handler_unittest.cc', 'websockets/websocket_handshake_unittest.cc', 'websockets/websocket_job_unittest.cc', + 'websockets/websocket_net_log_params_unittest.cc', 'websockets/websocket_throttle_unittest.cc', 'websockets/websocket_unittest.cc', ], @@ -1009,6 +1011,11 @@ 'base/dnssec_unittest.cc', ], }, + { # else, remove openssl specific tests + 'sources!': [ + 'base/x509_openssl_util_unittest.cc', + ], + } ], [ 'OS == "win"', { 'sources!': [ @@ -1172,6 +1179,7 @@ ['inside_chromium_build==1', { 'dependencies': [ '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', + '../chrome/browser/policy/proto/device_management_proto.gyp:device_management_proto', '../third_party/protobuf/protobuf.gyp:py_proto', ], }], @@ -1381,6 +1389,36 @@ # }, # ] # }], + ['OS=="linux"', { + 'targets': [ + { + 'target_name': 'snap_start_unittests', + 'type': 'executable', + 'dependencies': [ + 'net', + 'net_test_support', + 'openssl_helper', + '../build/linux/system.gyp:nss', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + ], + 'sources': [ + 'base/run_all_unittests.cc', + 'socket/ssl_client_socket_snapstart_unittest.cc', + ] + }, + { + 'target_name': 'openssl_helper', + 'type': 'executable', + 'dependencies': [ + '../third_party/openssl/openssl.gyp:openssl', + ], + 'sources': [ + 'test/openssl_helper.cc', + ], + }, + ], + }], ['OS=="win"', { 'targets': [ { |