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

Side by Side Diff: net/net.gyp

Issue 12220104: Wire up SSL client authentication for OpenSSL/Android through the net/ stack (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove chrome/browser changes + fix linux_redux build Created 7 years, 10 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'base/network_change_notifier_win.h', 228 'base/network_change_notifier_win.h',
229 'base/network_config_watcher_mac.cc', 229 'base/network_config_watcher_mac.cc',
230 'base/network_config_watcher_mac.h', 230 'base/network_config_watcher_mac.h',
231 'base/network_delegate.cc', 231 'base/network_delegate.cc',
232 'base/network_delegate.h', 232 'base/network_delegate.h',
233 'base/nss_cert_database.cc', 233 'base/nss_cert_database.cc',
234 'base/nss_cert_database.h', 234 'base/nss_cert_database.h',
235 'base/nss_memio.c', 235 'base/nss_memio.c',
236 'base/nss_memio.h', 236 'base/nss_memio.h',
237 'base/openssl_memory_private_key_store.cc', 237 'base/openssl_memory_private_key_store.cc',
238 'base/openssl_private_key_store.cc',
238 'base/openssl_private_key_store.h', 239 'base/openssl_private_key_store.h',
239 'base/openssl_private_key_store_android.cc', 240 'base/openssl_private_key_store_android.cc',
240 'base/pem_tokenizer.cc', 241 'base/pem_tokenizer.cc',
241 'base/pem_tokenizer.h', 242 'base/pem_tokenizer.h',
242 'base/platform_mime_util.h', 243 'base/platform_mime_util.h',
243 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 244 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
244 'base/platform_mime_util_linux.cc', 245 'base/platform_mime_util_linux.cc',
245 'base/platform_mime_util_mac.mm', 246 'base/platform_mime_util_mac.mm',
246 'base/platform_mime_util_win.cc', 247 'base/platform_mime_util_win.cc',
247 'base/prioritized_dispatcher.cc', 248 'base/prioritized_dispatcher.cc',
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 ], 1068 ],
1068 }, 1069 },
1069 { # else !use_openssl: remove the unneeded files 1070 { # else !use_openssl: remove the unneeded files
1070 'sources!': [ 1071 'sources!': [
1071 'base/cert_database_openssl.cc', 1072 'base/cert_database_openssl.cc',
1072 'base/cert_verify_proc_openssl.cc', 1073 'base/cert_verify_proc_openssl.cc',
1073 'base/cert_verify_proc_openssl.h', 1074 'base/cert_verify_proc_openssl.h',
1074 'base/crypto_module_openssl.cc', 1075 'base/crypto_module_openssl.cc',
1075 'base/keygen_handler_openssl.cc', 1076 'base/keygen_handler_openssl.cc',
1076 'base/openssl_memory_private_key_store.cc', 1077 'base/openssl_memory_private_key_store.cc',
1078 'base/openssl_private_key_store.cc',
1077 'base/openssl_private_key_store.h', 1079 'base/openssl_private_key_store.h',
1078 'base/openssl_private_key_store_android.cc', 1080 'base/openssl_private_key_store_android.cc',
1079 'base/test_root_certs_openssl.cc', 1081 'base/test_root_certs_openssl.cc',
1080 'base/x509_certificate_openssl.cc', 1082 'base/x509_certificate_openssl.cc',
1081 'base/x509_util_openssl.cc', 1083 'base/x509_util_openssl.cc',
1082 'base/x509_util_openssl.h', 1084 'base/x509_util_openssl.h',
1083 'socket/ssl_client_socket_openssl.cc', 1085 'socket/ssl_client_socket_openssl.cc',
1084 'socket/ssl_client_socket_openssl.h', 1086 'socket/ssl_client_socket_openssl.h',
1085 'socket/ssl_server_socket_openssl.cc', 1087 'socket/ssl_server_socket_openssl.cc',
1086 ], 1088 ],
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 'base/mapped_host_resolver_unittest.cc', 1344 'base/mapped_host_resolver_unittest.cc',
1343 'base/mime_sniffer_unittest.cc', 1345 'base/mime_sniffer_unittest.cc',
1344 'base/mime_util_unittest.cc', 1346 'base/mime_util_unittest.cc',
1345 'base/mock_filter_context.cc', 1347 'base/mock_filter_context.cc',
1346 'base/mock_filter_context.h', 1348 'base/mock_filter_context.h',
1347 'base/multi_threaded_cert_verifier_unittest.cc', 1349 'base/multi_threaded_cert_verifier_unittest.cc',
1348 'base/net_log_unittest.h', 1350 'base/net_log_unittest.h',
1349 'base/net_util_unittest.cc', 1351 'base/net_util_unittest.cc',
1350 'base/network_change_notifier_win_unittest.cc', 1352 'base/network_change_notifier_win_unittest.cc',
1351 'base/nss_cert_database_unittest.cc', 1353 'base/nss_cert_database_unittest.cc',
1354 'base/openssl_private_key_store_unittest.cc',
1352 'base/pem_tokenizer_unittest.cc', 1355 'base/pem_tokenizer_unittest.cc',
1353 'base/prioritized_dispatcher_unittest.cc', 1356 'base/prioritized_dispatcher_unittest.cc',
1354 'base/priority_queue_unittest.cc', 1357 'base/priority_queue_unittest.cc',
1355 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ', 1358 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ',
1356 'base/run_all_unittests.cc', 1359 'base/run_all_unittests.cc',
1357 'base/sdch_filter_unittest.cc', 1360 'base/sdch_filter_unittest.cc',
1358 'base/server_bound_cert_service_unittest.cc', 1361 'base/server_bound_cert_service_unittest.cc',
1359 'base/single_request_host_resolver_unittest.cc', 1362 'base/single_request_host_resolver_unittest.cc',
1360 'base/ssl_cipher_suite_names_unittest.cc', 1363 'base/ssl_cipher_suite_names_unittest.cc',
1361 'base/ssl_client_auth_cache_unittest.cc', 1364 'base/ssl_client_auth_cache_unittest.cc',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1529 'quic/quic_time_test.cc', 1532 'quic/quic_time_test.cc',
1530 'quic/reliable_quic_stream_test.cc', 1533 'quic/reliable_quic_stream_test.cc',
1531 'socket/buffered_write_stream_socket_unittest.cc', 1534 'socket/buffered_write_stream_socket_unittest.cc',
1532 'socket/client_socket_pool_base_unittest.cc', 1535 'socket/client_socket_pool_base_unittest.cc',
1533 'socket/deterministic_socket_data_unittest.cc', 1536 'socket/deterministic_socket_data_unittest.cc',
1534 'socket/mock_client_socket_pool_manager.cc', 1537 'socket/mock_client_socket_pool_manager.cc',
1535 'socket/mock_client_socket_pool_manager.h', 1538 'socket/mock_client_socket_pool_manager.h',
1536 'socket/socks5_client_socket_unittest.cc', 1539 'socket/socks5_client_socket_unittest.cc',
1537 'socket/socks_client_socket_pool_unittest.cc', 1540 'socket/socks_client_socket_pool_unittest.cc',
1538 'socket/socks_client_socket_unittest.cc', 1541 'socket/socks_client_socket_unittest.cc',
1542 'socket/ssl_client_socket_openssl_unittest.cc',
1539 'socket/ssl_client_socket_pool_unittest.cc', 1543 'socket/ssl_client_socket_pool_unittest.cc',
1540 'socket/ssl_client_socket_unittest.cc', 1544 'socket/ssl_client_socket_unittest.cc',
1541 'socket/ssl_server_socket_unittest.cc', 1545 'socket/ssl_server_socket_unittest.cc',
1542 'socket/tcp_client_socket_unittest.cc', 1546 'socket/tcp_client_socket_unittest.cc',
1543 'socket/tcp_server_socket_unittest.cc', 1547 'socket/tcp_server_socket_unittest.cc',
1544 'socket/transport_client_socket_pool_unittest.cc', 1548 'socket/transport_client_socket_pool_unittest.cc',
1545 'socket/transport_client_socket_unittest.cc', 1549 'socket/transport_client_socket_unittest.cc',
1546 'socket_stream/socket_stream_metrics_unittest.cc', 1550 'socket_stream/socket_stream_metrics_unittest.cc',
1547 'socket_stream/socket_stream_unittest.cc', 1551 'socket_stream/socket_stream_unittest.cc',
1548 'spdy/buffered_spdy_framer_spdy3_unittest.cc', 1552 'spdy/buffered_spdy_framer_spdy3_unittest.cc',
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 # When building for OpenSSL, we need to exclude NSS specific tests. 1673 # When building for OpenSSL, we need to exclude NSS specific tests.
1670 # TODO(bulach): Add equivalent tests when the underlying 1674 # TODO(bulach): Add equivalent tests when the underlying
1671 # functionality is ported to OpenSSL. 1675 # functionality is ported to OpenSSL.
1672 'sources!': [ 1676 'sources!': [
1673 'base/client_cert_store_impl_unittest.cc', 1677 'base/client_cert_store_impl_unittest.cc',
1674 'base/nss_cert_database_unittest.cc', 1678 'base/nss_cert_database_unittest.cc',
1675 'base/x509_util_nss_unittest.cc', 1679 'base/x509_util_nss_unittest.cc',
1676 ], 1680 ],
1677 }, { # else !use_openssl: remove the unneeded files 1681 }, { # else !use_openssl: remove the unneeded files
1678 'sources!': [ 1682 'sources!': [
1683 'base/openssl_private_key_store_unittest.cc',
1679 'base/x509_util_openssl_unittest.cc', 1684 'base/x509_util_openssl_unittest.cc',
1685 'socket/ssl_client_socket_openssl_unittest.cc',
1680 ], 1686 ],
1681 }, 1687 },
1682 ], 1688 ],
1683 [ 'enable_websockets != 1', { 1689 [ 'enable_websockets != 1', {
1684 'sources/': [ 1690 'sources/': [
1685 ['exclude', '^socket_stream/'], 1691 ['exclude', '^socket_stream/'],
1686 ['exclude', '^websockets/'], 1692 ['exclude', '^websockets/'],
1687 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'], 1693 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
1688 ], 1694 ],
1689 }], 1695 }],
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
2502 '--result', '<@(_outputs)', 2508 '--result', '<@(_outputs)',
2503 '--isolate', 'net_unittests.isolate', 2509 '--isolate', 'net_unittests.isolate',
2504 ], 2510 ],
2505 }, 2511 },
2506 ], 2512 ],
2507 }, 2513 },
2508 ], 2514 ],
2509 }], 2515 }],
2510 ], 2516 ],
2511 } 2517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698