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

Side by Side Diff: net/net.gyp

Issue 13351006: net: move openssl and keygen from net/base to net/cert (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ssl it is Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « net/base/openssl_client_key_store_unittest.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'use_simple_cache_backend%': 0, 10 'use_simple_cache_backend%': 0,
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 'base/network_change_notifier_mac.cc', 183 'base/network_change_notifier_mac.cc',
184 'base/network_change_notifier_mac.h', 184 'base/network_change_notifier_mac.h',
185 'base/network_change_notifier_win.cc', 185 'base/network_change_notifier_win.cc',
186 'base/network_change_notifier_win.h', 186 'base/network_change_notifier_win.h',
187 'base/network_config_watcher_mac.cc', 187 'base/network_config_watcher_mac.cc',
188 'base/network_config_watcher_mac.h', 188 'base/network_config_watcher_mac.h',
189 'base/network_delegate.cc', 189 'base/network_delegate.cc',
190 'base/network_delegate.h', 190 'base/network_delegate.h',
191 'base/nss_memio.c', 191 'base/nss_memio.c',
192 'base/nss_memio.h', 192 'base/nss_memio.h',
193 'base/openssl_client_key_store.cc',
194 'base/openssl_client_key_store.h',
195 'base/openssl_private_key_store.h', 193 'base/openssl_private_key_store.h',
196 'base/openssl_private_key_store_android.cc', 194 'base/openssl_private_key_store_android.cc',
197 'base/openssl_private_key_store_memory.cc', 195 'base/openssl_private_key_store_memory.cc',
198 'base/platform_mime_util.h', 196 'base/platform_mime_util.h',
199 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 197 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
200 'base/platform_mime_util_linux.cc', 198 'base/platform_mime_util_linux.cc',
201 'base/platform_mime_util_mac.mm', 199 'base/platform_mime_util_mac.mm',
202 'base/platform_mime_util_win.cc', 200 'base/platform_mime_util_win.cc',
203 'base/prioritized_dispatcher.cc', 201 'base/prioritized_dispatcher.cc',
204 'base/prioritized_dispatcher.h', 202 'base/prioritized_dispatcher.h',
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 'spdy/spdy_stream.h', 858 'spdy/spdy_stream.h',
861 'spdy/spdy_websocket_stream.cc', 859 'spdy/spdy_websocket_stream.cc',
862 'spdy/spdy_websocket_stream.h', 860 'spdy/spdy_websocket_stream.h',
863 'ssl/client_cert_store.h', 861 'ssl/client_cert_store.h',
864 'ssl/client_cert_store_impl.h', 862 'ssl/client_cert_store_impl.h',
865 'ssl/client_cert_store_impl_mac.cc', 863 'ssl/client_cert_store_impl_mac.cc',
866 'ssl/client_cert_store_impl_nss.cc', 864 'ssl/client_cert_store_impl_nss.cc',
867 'ssl/client_cert_store_impl_win.cc', 865 'ssl/client_cert_store_impl_win.cc',
868 'ssl/default_server_bound_cert_store.cc', 866 'ssl/default_server_bound_cert_store.cc',
869 'ssl/default_server_bound_cert_store.h', 867 'ssl/default_server_bound_cert_store.h',
868 'ssl/openssl_client_key_store.cc',
869 'ssl/openssl_client_key_store.h',
870 'ssl/server_bound_cert_service.cc', 870 'ssl/server_bound_cert_service.cc',
871 'ssl/server_bound_cert_service.h', 871 'ssl/server_bound_cert_service.h',
872 'ssl/server_bound_cert_store.cc', 872 'ssl/server_bound_cert_store.cc',
873 'ssl/server_bound_cert_store.h', 873 'ssl/server_bound_cert_store.h',
874 'ssl/ssl_cert_request_info.cc', 874 'ssl/ssl_cert_request_info.cc',
875 'ssl/ssl_cert_request_info.h', 875 'ssl/ssl_cert_request_info.h',
876 'ssl/ssl_cipher_suite_names.cc', 876 'ssl/ssl_cipher_suite_names.cc',
877 'ssl/ssl_cipher_suite_names.h', 877 'ssl/ssl_cipher_suite_names.h',
878 'ssl/ssl_client_auth_cache.cc', 878 'ssl/ssl_client_auth_cache.cc',
879 'ssl/ssl_client_auth_cache.h', 879 'ssl/ssl_client_auth_cache.h',
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 1119 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
1120 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 1120 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
1121 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 1121 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
1122 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 1122 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
1123 ], 1123 ],
1124 }, 1124 },
1125 { # else !use_openssl: remove the unneeded files 1125 { # else !use_openssl: remove the unneeded files
1126 'sources!': [ 1126 'sources!': [
1127 'base/crypto_module_openssl.cc', 1127 'base/crypto_module_openssl.cc',
1128 'base/keygen_handler_openssl.cc', 1128 'base/keygen_handler_openssl.cc',
1129 'base/openssl_client_key_store.cc',
1130 'base/openssl_client_key_store.h',
1131 'base/openssl_private_key_store.h', 1129 'base/openssl_private_key_store.h',
1132 'base/openssl_private_key_store_android.cc', 1130 'base/openssl_private_key_store_android.cc',
1133 'base/openssl_private_key_store_memory.cc', 1131 'base/openssl_private_key_store_memory.cc',
1134 'cert/cert_database_openssl.cc', 1132 'cert/cert_database_openssl.cc',
1135 'cert/cert_verify_proc_openssl.cc', 1133 'cert/cert_verify_proc_openssl.cc',
1136 'cert/cert_verify_proc_openssl.h', 1134 'cert/cert_verify_proc_openssl.h',
1137 'cert/test_root_certs_openssl.cc', 1135 'cert/test_root_certs_openssl.cc',
1138 'cert/x509_certificate_openssl.cc', 1136 'cert/x509_certificate_openssl.cc',
1139 'cert/x509_util_openssl.cc', 1137 'cert/x509_util_openssl.cc',
1140 'cert/x509_util_openssl.h', 1138 'cert/x509_util_openssl.h',
1141 'quic/crypto/aes_128_gcm_decrypter_openssl.cc', 1139 'quic/crypto/aes_128_gcm_decrypter_openssl.cc',
1142 'quic/crypto/aes_128_gcm_encrypter_openssl.cc', 1140 'quic/crypto/aes_128_gcm_encrypter_openssl.cc',
1143 'quic/crypto/p256_key_exchange_openssl.cc', 1141 'quic/crypto/p256_key_exchange_openssl.cc',
1144 'quic/crypto/scoped_evp_cipher_ctx.h', 1142 'quic/crypto/scoped_evp_cipher_ctx.h',
1145 'socket/ssl_client_socket_openssl.cc', 1143 'socket/ssl_client_socket_openssl.cc',
1146 'socket/ssl_client_socket_openssl.h', 1144 'socket/ssl_client_socket_openssl.h',
1147 'socket/ssl_server_socket_openssl.cc', 1145 'socket/ssl_server_socket_openssl.cc',
1146 'ssl/openssl_client_key_store.cc',
1147 'ssl/openssl_client_key_store.h',
1148 ], 1148 ],
1149 }, 1149 },
1150 ], 1150 ],
1151 [ 'use_glib == 1', { 1151 [ 'use_glib == 1', {
1152 'dependencies': [ 1152 'dependencies': [
1153 '../build/linux/system.gyp:gconf', 1153 '../build/linux/system.gyp:gconf',
1154 '../build/linux/system.gyp:gio', 1154 '../build/linux/system.gyp:gio',
1155 ], 1155 ],
1156 'conditions': [ 1156 'conditions': [
1157 ['use_openssl==1', { 1157 ['use_openssl==1', {
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 'base/host_port_pair_unittest.cc', 1395 'base/host_port_pair_unittest.cc',
1396 'base/ip_endpoint_unittest.cc', 1396 'base/ip_endpoint_unittest.cc',
1397 'base/keygen_handler_unittest.cc', 1397 'base/keygen_handler_unittest.cc',
1398 'base/mime_sniffer_unittest.cc', 1398 'base/mime_sniffer_unittest.cc',
1399 'base/mime_util_unittest.cc', 1399 'base/mime_util_unittest.cc',
1400 'base/mock_filter_context.cc', 1400 'base/mock_filter_context.cc',
1401 'base/mock_filter_context.h', 1401 'base/mock_filter_context.h',
1402 'base/net_log_unittest.h', 1402 'base/net_log_unittest.h',
1403 'base/net_util_unittest.cc', 1403 'base/net_util_unittest.cc',
1404 'base/network_change_notifier_win_unittest.cc', 1404 'base/network_change_notifier_win_unittest.cc',
1405 'base/openssl_client_key_store_unittest.cc',
1406 'base/prioritized_dispatcher_unittest.cc', 1405 'base/prioritized_dispatcher_unittest.cc',
1407 'base/priority_queue_unittest.cc', 1406 'base/priority_queue_unittest.cc',
1408 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ', 1407 'base/registry_controlled_domains/registry_controlled_domain_unittest.cc ',
1409 'base/sdch_filter_unittest.cc', 1408 'base/sdch_filter_unittest.cc',
1410 'base/static_cookie_policy_unittest.cc', 1409 'base/static_cookie_policy_unittest.cc',
1411 'base/tcp_listen_socket_unittest.cc', 1410 'base/tcp_listen_socket_unittest.cc',
1412 'base/tcp_listen_socket_unittest.h', 1411 'base/tcp_listen_socket_unittest.h',
1413 'base/test_completion_callback_unittest.cc', 1412 'base/test_completion_callback_unittest.cc',
1414 'base/unix_domain_socket_posix_unittest.cc', 1413 'base/unix_domain_socket_posix_unittest.cc',
1415 'base/upload_bytes_element_reader_unittest.cc', 1414 'base/upload_bytes_element_reader_unittest.cc',
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 'spdy/spdy_test_utils.cc', 1655 'spdy/spdy_test_utils.cc',
1657 'spdy/spdy_test_utils.h', 1656 'spdy/spdy_test_utils.h',
1658 'spdy/spdy_websocket_stream_spdy2_unittest.cc', 1657 'spdy/spdy_websocket_stream_spdy2_unittest.cc',
1659 'spdy/spdy_websocket_stream_spdy3_unittest.cc', 1658 'spdy/spdy_websocket_stream_spdy3_unittest.cc',
1660 'spdy/spdy_websocket_test_util_spdy2.cc', 1659 'spdy/spdy_websocket_test_util_spdy2.cc',
1661 'spdy/spdy_websocket_test_util_spdy2.h', 1660 'spdy/spdy_websocket_test_util_spdy2.h',
1662 'spdy/spdy_websocket_test_util_spdy3.cc', 1661 'spdy/spdy_websocket_test_util_spdy3.cc',
1663 'spdy/spdy_websocket_test_util_spdy3.h', 1662 'spdy/spdy_websocket_test_util_spdy3.h',
1664 'ssl/client_cert_store_impl_unittest.cc', 1663 'ssl/client_cert_store_impl_unittest.cc',
1665 'ssl/default_server_bound_cert_store_unittest.cc', 1664 'ssl/default_server_bound_cert_store_unittest.cc',
1665 'ssl/openssl_client_key_store_unittest.cc',
1666 'ssl/server_bound_cert_service_unittest.cc', 1666 'ssl/server_bound_cert_service_unittest.cc',
1667 'ssl/ssl_cipher_suite_names_unittest.cc', 1667 'ssl/ssl_cipher_suite_names_unittest.cc',
1668 'ssl/ssl_client_auth_cache_unittest.cc', 1668 'ssl/ssl_client_auth_cache_unittest.cc',
1669 'ssl/ssl_config_service_unittest.cc', 1669 'ssl/ssl_config_service_unittest.cc',
1670 'test/python_utils_unittest.cc', 1670 'test/python_utils_unittest.cc',
1671 'test/run_all_unittests.cc', 1671 'test/run_all_unittests.cc',
1672 'test/test_certificate_data.h', 1672 'test/test_certificate_data.h',
1673 'tools/dump_cache/url_to_filename_encoder.cc', 1673 'tools/dump_cache/url_to_filename_encoder.cc',
1674 'tools/dump_cache/url_to_filename_encoder.h', 1674 'tools/dump_cache/url_to_filename_encoder.h',
1675 'tools/dump_cache/url_to_filename_encoder_unittest.cc', 1675 'tools/dump_cache/url_to_filename_encoder_unittest.cc',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 # When building for OpenSSL, we need to exclude NSS specific tests. 1761 # When building for OpenSSL, we need to exclude NSS specific tests.
1762 # TODO(bulach): Add equivalent tests when the underlying 1762 # TODO(bulach): Add equivalent tests when the underlying
1763 # functionality is ported to OpenSSL. 1763 # functionality is ported to OpenSSL.
1764 'sources!': [ 1764 'sources!': [
1765 'cert/nss_cert_database_unittest.cc', 1765 'cert/nss_cert_database_unittest.cc',
1766 'cert/x509_util_nss_unittest.cc', 1766 'cert/x509_util_nss_unittest.cc',
1767 'ssl/client_cert_store_impl_unittest.cc', 1767 'ssl/client_cert_store_impl_unittest.cc',
1768 ], 1768 ],
1769 }, { # else !use_openssl: remove the unneeded files 1769 }, { # else !use_openssl: remove the unneeded files
1770 'sources!': [ 1770 'sources!': [
1771 'base/openssl_client_key_store_unittest.cc',
1772 'cert/x509_util_openssl_unittest.cc', 1771 'cert/x509_util_openssl_unittest.cc',
1773 'socket/ssl_client_socket_openssl_unittest.cc', 1772 'socket/ssl_client_socket_openssl_unittest.cc',
1773 'ssl/openssl_client_key_store_unittest.cc',
1774 ], 1774 ],
1775 }, 1775 },
1776 ], 1776 ],
1777 [ 'enable_websockets != 1', { 1777 [ 'enable_websockets != 1', {
1778 'sources/': [ 1778 'sources/': [
1779 ['exclude', '^socket_stream/'], 1779 ['exclude', '^socket_stream/'],
1780 ['exclude', '^websockets/'], 1780 ['exclude', '^websockets/'],
1781 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'], 1781 ['exclude', '^spdy/spdy_websocket_stream_spdy._unittest\\.cc$'],
1782 ], 1782 ],
1783 }], 1783 }],
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 '--result', '<@(_outputs)', 2693 '--result', '<@(_outputs)',
2694 '--isolate', 'net_unittests.isolate', 2694 '--isolate', 'net_unittests.isolate',
2695 ], 2695 ],
2696 }, 2696 },
2697 ], 2697 ],
2698 }, 2698 },
2699 ], 2699 ],
2700 }], 2700 }],
2701 ], 2701 ],
2702 } 2702 }
OLDNEW
« no previous file with comments | « net/base/openssl_client_key_store_unittest.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698