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

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: 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 'base/network_change_notifier_win.cc', 233 'base/network_change_notifier_win.cc',
234 'base/network_change_notifier_win.h', 234 'base/network_change_notifier_win.h',
235 'base/network_config_watcher_mac.cc', 235 'base/network_config_watcher_mac.cc',
236 'base/network_config_watcher_mac.h', 236 'base/network_config_watcher_mac.h',
237 'base/network_delegate.cc', 237 'base/network_delegate.cc',
238 'base/network_delegate.h', 238 'base/network_delegate.h',
239 'base/nss_cert_database.cc', 239 'base/nss_cert_database.cc',
240 'base/nss_cert_database.h', 240 'base/nss_cert_database.h',
241 'base/nss_memio.c', 241 'base/nss_memio.c',
242 'base/nss_memio.h', 242 'base/nss_memio.h',
243 'base/openssl_memory_private_key_store.cc', 243 'base/openssl_private_key_store_memory.cc',
244 'base/openssl_private_key_store.cc',
244 'base/openssl_private_key_store.h', 245 'base/openssl_private_key_store.h',
245 'base/openssl_private_key_store_android.cc', 246 'base/openssl_private_key_store_android.cc',
246 'base/pem_tokenizer.cc', 247 'base/pem_tokenizer.cc',
247 'base/pem_tokenizer.h', 248 'base/pem_tokenizer.h',
248 'base/platform_mime_util.h', 249 'base/platform_mime_util.h',
249 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 250 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
250 'base/platform_mime_util_linux.cc', 251 'base/platform_mime_util_linux.cc',
251 'base/platform_mime_util_mac.mm', 252 'base/platform_mime_util_mac.mm',
252 'base/platform_mime_util_win.cc', 253 'base/platform_mime_util_win.cc',
253 'base/prioritized_dispatcher.cc', 254 'base/prioritized_dispatcher.cc',
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 1081 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
1081 ], 1082 ],
1082 }, 1083 },
1083 { # else !use_openssl: remove the unneeded files 1084 { # else !use_openssl: remove the unneeded files
1084 'sources!': [ 1085 'sources!': [
1085 'base/cert_database_openssl.cc', 1086 'base/cert_database_openssl.cc',
1086 'base/cert_verify_proc_openssl.cc', 1087 'base/cert_verify_proc_openssl.cc',
1087 'base/cert_verify_proc_openssl.h', 1088 'base/cert_verify_proc_openssl.h',
1088 'base/crypto_module_openssl.cc', 1089 'base/crypto_module_openssl.cc',
1089 'base/keygen_handler_openssl.cc', 1090 'base/keygen_handler_openssl.cc',
1090 'base/openssl_memory_private_key_store.cc', 1091 'base/openssl_private_key_store_memory.cc',
1092 'base/openssl_private_key_store.cc',
1091 'base/openssl_private_key_store.h', 1093 'base/openssl_private_key_store.h',
1092 'base/openssl_private_key_store_android.cc', 1094 'base/openssl_private_key_store_android.cc',
1093 'base/test_root_certs_openssl.cc', 1095 'base/test_root_certs_openssl.cc',
1094 'base/x509_certificate_openssl.cc', 1096 'base/x509_certificate_openssl.cc',
1095 'base/x509_util_openssl.cc', 1097 'base/x509_util_openssl.cc',
1096 'base/x509_util_openssl.h', 1098 'base/x509_util_openssl.h',
1097 'socket/ssl_client_socket_openssl.cc', 1099 'socket/ssl_client_socket_openssl.cc',
1098 'socket/ssl_client_socket_openssl.h', 1100 'socket/ssl_client_socket_openssl.h',
1099 'socket/ssl_server_socket_openssl.cc', 1101 'socket/ssl_server_socket_openssl.cc',
1100 ], 1102 ],
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 ], 1251 ],
1250 }], 1252 }],
1251 [ 'OS == "android"', { 1253 [ 'OS == "android"', {
1252 'dependencies': [ 1254 'dependencies': [
1253 '../third_party/openssl/openssl.gyp:openssl', 1255 '../third_party/openssl/openssl.gyp:openssl',
1254 'net_jni_headers', 1256 'net_jni_headers',
1255 ], 1257 ],
1256 'sources!': [ 1258 'sources!': [
1257 'base/cert_database_openssl.cc', 1259 'base/cert_database_openssl.cc',
1258 'base/cert_verify_proc_openssl.cc', 1260 'base/cert_verify_proc_openssl.cc',
1259 'base/openssl_memory_private_key_store.cc', 1261 'base/openssl_private_key_store_memory.cc',
1260 'base/test_root_certs_openssl.cc', 1262 'base/test_root_certs_openssl.cc',
1261 ], 1263 ],
1262 # The net/android/keystore_openssl.cc source file needs to 1264 # The net/android/keystore_openssl.cc source file needs to
1263 # access an OpenSSL-internal header. 1265 # access an OpenSSL-internal header.
1264 'include_dirs': [ 1266 'include_dirs': [
1265 '../third_party/openssl', 1267 '../third_party/openssl',
1266 ], 1268 ],
1267 }, { # else OS != "android" 1269 }, { # else OS != "android"
1268 'defines': [ 1270 'defines': [
1269 # These are the features Android doesn't support. 1271 # These are the features Android doesn't support.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 'base/mapped_host_resolver_unittest.cc', 1358 'base/mapped_host_resolver_unittest.cc',
1357 'base/mime_sniffer_unittest.cc', 1359 'base/mime_sniffer_unittest.cc',
1358 'base/mime_util_unittest.cc', 1360 'base/mime_util_unittest.cc',
1359 'base/mock_filter_context.cc', 1361 'base/mock_filter_context.cc',
1360 'base/mock_filter_context.h', 1362 'base/mock_filter_context.h',
1361 'base/multi_threaded_cert_verifier_unittest.cc', 1363 'base/multi_threaded_cert_verifier_unittest.cc',
1362 'base/net_log_unittest.h', 1364 'base/net_log_unittest.h',
1363 'base/net_util_unittest.cc', 1365 'base/net_util_unittest.cc',
1364 'base/network_change_notifier_win_unittest.cc', 1366 'base/network_change_notifier_win_unittest.cc',
1365 'base/nss_cert_database_unittest.cc', 1367 'base/nss_cert_database_unittest.cc',
1368 'base/openssl_private_key_store_unittest.cc',
1366 'base/pem_tokenizer_unittest.cc', 1369 'base/pem_tokenizer_unittest.cc',
1367 'base/prioritized_dispatcher_unittest.cc', 1370 'base/prioritized_dispatcher_unittest.cc',
1368 'base/priority_queue_unittest.cc', 1371 'base/priority_queue_unittest.cc',
1369 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ', 1372 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ',
1370 'base/run_all_unittests.cc', 1373 'base/run_all_unittests.cc',
1371 'base/sdch_filter_unittest.cc', 1374 'base/sdch_filter_unittest.cc',
1372 'base/server_bound_cert_service_unittest.cc', 1375 'base/server_bound_cert_service_unittest.cc',
1373 'base/single_request_host_resolver_unittest.cc', 1376 'base/single_request_host_resolver_unittest.cc',
1374 'base/ssl_cipher_suite_names_unittest.cc', 1377 'base/ssl_cipher_suite_names_unittest.cc',
1375 'base/ssl_client_auth_cache_unittest.cc', 1378 'base/ssl_client_auth_cache_unittest.cc',
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 'quic/quic_time_test.cc', 1551 'quic/quic_time_test.cc',
1549 'quic/reliable_quic_stream_test.cc', 1552 'quic/reliable_quic_stream_test.cc',
1550 'socket/buffered_write_stream_socket_unittest.cc', 1553 'socket/buffered_write_stream_socket_unittest.cc',
1551 'socket/client_socket_pool_base_unittest.cc', 1554 'socket/client_socket_pool_base_unittest.cc',
1552 'socket/deterministic_socket_data_unittest.cc', 1555 'socket/deterministic_socket_data_unittest.cc',
1553 'socket/mock_client_socket_pool_manager.cc', 1556 'socket/mock_client_socket_pool_manager.cc',
1554 'socket/mock_client_socket_pool_manager.h', 1557 'socket/mock_client_socket_pool_manager.h',
1555 'socket/socks5_client_socket_unittest.cc', 1558 'socket/socks5_client_socket_unittest.cc',
1556 'socket/socks_client_socket_pool_unittest.cc', 1559 'socket/socks_client_socket_pool_unittest.cc',
1557 'socket/socks_client_socket_unittest.cc', 1560 'socket/socks_client_socket_unittest.cc',
1561 'socket/ssl_client_socket_openssl_unittest.cc',
1558 'socket/ssl_client_socket_pool_unittest.cc', 1562 'socket/ssl_client_socket_pool_unittest.cc',
1559 'socket/ssl_client_socket_unittest.cc', 1563 'socket/ssl_client_socket_unittest.cc',
1560 'socket/ssl_server_socket_unittest.cc', 1564 'socket/ssl_server_socket_unittest.cc',
1561 'socket/tcp_client_socket_unittest.cc', 1565 'socket/tcp_client_socket_unittest.cc',
1562 'socket/tcp_server_socket_unittest.cc', 1566 'socket/tcp_server_socket_unittest.cc',
1563 'socket/transport_client_socket_pool_unittest.cc', 1567 'socket/transport_client_socket_pool_unittest.cc',
1564 'socket/transport_client_socket_unittest.cc', 1568 'socket/transport_client_socket_unittest.cc',
1565 'socket_stream/socket_stream_metrics_unittest.cc', 1569 'socket_stream/socket_stream_metrics_unittest.cc',
1566 'socket_stream/socket_stream_unittest.cc', 1570 'socket_stream/socket_stream_unittest.cc',
1567 'spdy/buffered_spdy_framer_spdy3_unittest.cc', 1571 'spdy/buffered_spdy_framer_spdy3_unittest.cc',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 # When building for OpenSSL, we need to exclude NSS specific tests. 1697 # When building for OpenSSL, we need to exclude NSS specific tests.
1694 # TODO(bulach): Add equivalent tests when the underlying 1698 # TODO(bulach): Add equivalent tests when the underlying
1695 # functionality is ported to OpenSSL. 1699 # functionality is ported to OpenSSL.
1696 'sources!': [ 1700 'sources!': [
1697 'base/client_cert_store_impl_unittest.cc', 1701 'base/client_cert_store_impl_unittest.cc',
1698 'base/nss_cert_database_unittest.cc', 1702 'base/nss_cert_database_unittest.cc',
1699 'base/x509_util_nss_unittest.cc', 1703 'base/x509_util_nss_unittest.cc',
1700 ], 1704 ],
1701 }, { # else !use_openssl: remove the unneeded files 1705 }, { # else !use_openssl: remove the unneeded files
1702 'sources!': [ 1706 'sources!': [
1707 'base/openssl_private_key_store_unittest.cc',
1703 'base/x509_util_openssl_unittest.cc', 1708 'base/x509_util_openssl_unittest.cc',
1709 'socket/ssl_client_socket_openssl_unittest.cc',
1704 ], 1710 ],
1705 }, 1711 },
1706 ], 1712 ],
1707 [ 'enable_websockets != 1', { 1713 [ 'enable_websockets != 1', {
1708 'sources/': [ 1714 'sources/': [
1709 ['exclude', '^socket_stream/'], 1715 ['exclude', '^socket_stream/'],
1710 ['exclude', '^websockets/'], 1716 ['exclude', '^websockets/'],
1711 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'], 1717 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
1712 ], 1718 ],
1713 }], 1719 }],
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
2540 '--result', '<@(_outputs)', 2546 '--result', '<@(_outputs)',
2541 '--isolate', 'net_unittests.isolate', 2547 '--isolate', 'net_unittests.isolate',
2542 ], 2548 ],
2543 }, 2549 },
2544 ], 2550 ],
2545 }, 2551 },
2546 ], 2552 ],
2547 }], 2553 }],
2548 ], 2554 ],
2549 } 2555 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698