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

Side by Side Diff: net/net.gyp

Issue 10928107: Support x509 certificate on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added unittests and fixed compilation issues. Created 8 years, 3 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
« no previous file with comments | « net/base/x509_util_ios.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 'base/winsock_init.cc', 284 'base/winsock_init.cc',
285 'base/winsock_init.h', 285 'base/winsock_init.h',
286 'base/winsock_util.cc', 286 'base/winsock_util.cc',
287 'base/winsock_util.h', 287 'base/winsock_util.h',
288 'base/x509_cert_types.cc', 288 'base/x509_cert_types.cc',
289 'base/x509_cert_types.h', 289 'base/x509_cert_types.h',
290 'base/x509_cert_types_mac.cc', 290 'base/x509_cert_types_mac.cc',
291 'base/x509_cert_types_win.cc', 291 'base/x509_cert_types_win.cc',
292 'base/x509_certificate.cc', 292 'base/x509_certificate.cc',
293 'base/x509_certificate.h', 293 'base/x509_certificate.h',
294 'base/x509_certificate_ios.cc',
294 'base/x509_certificate_mac.cc', 295 'base/x509_certificate_mac.cc',
295 'base/x509_certificate_net_log_param.cc', 296 'base/x509_certificate_net_log_param.cc',
296 'base/x509_certificate_net_log_param.h', 297 'base/x509_certificate_net_log_param.h',
297 'base/x509_certificate_nss.cc', 298 'base/x509_certificate_nss.cc',
299 'base/x509_certificate_nss_util.cc',
300 'base/x509_certificate_nss_util.h',
298 'base/x509_certificate_openssl.cc', 301 'base/x509_certificate_openssl.cc',
299 'base/x509_certificate_win.cc', 302 'base/x509_certificate_win.cc',
300 'base/x509_util.h', 303 'base/x509_util.h',
304 'base/x509_util_ios.cc',
305 'base/x509_util_ios.h',
301 'base/x509_util_mac.cc', 306 'base/x509_util_mac.cc',
302 'base/x509_util_mac.h', 307 'base/x509_util_mac.h',
303 'base/x509_util_nss.cc', 308 'base/x509_util_nss.cc',
304 'base/x509_util_nss.h', 309 'base/x509_util_nss.h',
305 'base/x509_util_openssl.cc', 310 'base/x509_util_openssl.cc',
306 'base/x509_util_openssl.h', 311 'base/x509_util_openssl.h',
307 'base/zap.cc', 312 'base/zap.cc',
308 'base/zap.h', 313 'base/zap.h',
309 'cookies/canonical_cookie.cc', 314 'cookies/canonical_cookie.cc',
310 'cookies/canonical_cookie.h', 315 'cookies/canonical_cookie.h',
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 'base/cert_verify_proc_nss.cc', 905 'base/cert_verify_proc_nss.cc',
901 'base/cert_verify_proc_nss.h', 906 'base/cert_verify_proc_nss.h',
902 'base/crypto_module_nss.cc', 907 'base/crypto_module_nss.cc',
903 'base/dnssec_keyset.cc', 908 'base/dnssec_keyset.cc',
904 'base/dnssec_keyset.h', 909 'base/dnssec_keyset.h',
905 'base/keygen_handler_nss.cc', 910 'base/keygen_handler_nss.cc',
906 'base/nss_memio.c', 911 'base/nss_memio.c',
907 'base/nss_memio.h', 912 'base/nss_memio.h',
908 'base/test_root_certs_nss.cc', 913 'base/test_root_certs_nss.cc',
909 'base/x509_certificate_nss.cc', 914 'base/x509_certificate_nss.cc',
915 'base/x509_certificate_nss_util.cc',
916 'base/x509_certificate_nss_util.h',
910 'base/x509_util_nss.cc', 917 'base/x509_util_nss.cc',
911 'base/x509_util_nss.h', 918 'base/x509_util_nss.h',
912 'ocsp/nss_ocsp.cc', 919 'ocsp/nss_ocsp.cc',
913 'ocsp/nss_ocsp.h', 920 'ocsp/nss_ocsp.h',
914 'socket/nss_ssl_util.cc', 921 'socket/nss_ssl_util.cc',
915 'socket/nss_ssl_util.h', 922 'socket/nss_ssl_util.h',
916 'socket/ssl_client_socket_nss.cc', 923 'socket/ssl_client_socket_nss.cc',
917 'socket/ssl_client_socket_nss.h', 924 'socket/ssl_client_socket_nss.h',
918 'socket/ssl_server_socket_nss.cc', 925 'socket/ssl_server_socket_nss.cc',
919 'socket/ssl_server_socket_nss.h', 926 'socket/ssl_server_socket_nss.h',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 }], 988 }],
982 ], 989 ],
983 }, 990 },
984 { # else: OS is not in the above list 991 { # else: OS is not in the above list
985 'sources!': [ 992 'sources!': [
986 'base/cert_database_nss.cc', 993 'base/cert_database_nss.cc',
987 'base/crypto_module_nss.cc', 994 'base/crypto_module_nss.cc',
988 'base/keygen_handler_nss.cc', 995 'base/keygen_handler_nss.cc',
989 'base/test_root_certs_nss.cc', 996 'base/test_root_certs_nss.cc',
990 'base/x509_certificate_nss.cc', 997 'base/x509_certificate_nss.cc',
998 'base/x509_certificate_nss_util.cc',
999 'base/x509_certificate_nss_util.h',
droger 2012/09/11 17:26:49 x509_util_nss does not show here.
Ryan Sleevi 2012/09/11 18:39:27 And that's ok. The exclusion of these files is ab
991 'ocsp/nss_ocsp.cc', 1000 'ocsp/nss_ocsp.cc',
992 'ocsp/nss_ocsp.h', 1001 'ocsp/nss_ocsp.h',
993 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 1002 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
994 'third_party/mozilla_security_manager/nsKeygenHandler.h', 1003 'third_party/mozilla_security_manager/nsKeygenHandler.h',
995 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 1004 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
996 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 1005 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
997 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 1006 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
998 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 1007 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
999 ], 1008 ],
1000 }, 1009 },
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 'libraries': [ 1066 'libraries': [
1058 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 1067 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1059 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1068 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1060 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1069 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1061 '$(SDKROOT)/usr/lib/libresolv.dylib', 1070 '$(SDKROOT)/usr/lib/libresolv.dylib',
1062 ] 1071 ]
1063 }, 1072 },
1064 }, 1073 },
1065 ], 1074 ],
1066 [ 'OS == "ios"', { 1075 [ 'OS == "ios"', {
1076 'dependencies': [
1077 '../third_party/nss/nss.gyp:nss',
1078 'third_party/nss/ssl.gyp:libssl',
1079 ],
1067 'link_settings': { 1080 'link_settings': {
1068 'libraries': [ 1081 'libraries': [
1069 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', 1082 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
1070 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk', 1083 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk',
1084 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1071 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1085 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1072 '$(SDKROOT)/usr/lib/libresolv.dylib', 1086 '$(SDKROOT)/usr/lib/libresolv.dylib',
1073 ], 1087 ],
1074 }, 1088 },
1075 'sources/': [ 1089 'sources/': [
1076 # TODO(ios): Right now there is only a very limited subset of net 1090 # TODO(ios): Right now there is only a very limited subset of net
1077 # compiled on iOS, just enough to bring up the dependencies needed 1091 # compiled on iOS, just enough to bring up the dependencies needed
1078 # by the ui target. 1092 # by the ui target.
1079 ['exclude', '.*'], 1093 ['exclude', '.*'],
1094 ['include', '^base/asn1_util\\.'],
1080 ['include', '^base/dns_util\\.'], 1095 ['include', '^base/dns_util\\.'],
1081 ['include', '^base/escape\\.'], 1096 ['include', '^base/escape\\.'],
1097 ['include', '^base/ev_root_ca_metadata\\.'],
1082 ['include', '^base/ip_endpoint\\.'], 1098 ['include', '^base/ip_endpoint\\.'],
1083 ['include', '^base/mime_util\\.'], 1099 ['include', '^base/mime_util\\.'],
1084 ['include', '^base/net_errors\\.'], 1100 ['include', '^base/net_errors\\.'],
1085 ['include', '^base/network_change_notifier\\.'], 1101 ['include', '^base/network_change_notifier\\.'],
1086 ['include', '^base/net_errors_posix\\.cc$'], 1102 ['include', '^base/net_errors_posix\\.cc$'],
1087 ['include', '^base/net_export\\.h$'], 1103 ['include', '^base/net_export\\.h$'],
1088 ['include', '^base/net_log\\.'], 1104 ['include', '^base/net_log\\.'],
1089 ['include', '^base/net_module\\.'], 1105 ['include', '^base/net_module\\.'],
1090 ['include', '^base/net_util\\.'], 1106 ['include', '^base/net_util\\.'],
1091 ['include', '^base/net_util_posix\\.cc$'], 1107 ['include', '^base/net_util_posix\\.cc$'],
1092 ['include', '^base/platform_mime_util\\.h$'], 1108 ['include', '^base/platform_mime_util\\.h$'],
1109 ['include', '^base/pem_tokenizer\\.cc$'],
1110 ['include', '^base/pem_tokenizer\\.h$'],
1093 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'], 1111 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'],
1112 ['include', '^base/x509_certificate\\.'],
1113 ['include', '^base/x509_certificate_ios\\.'],
1114 ['include', '^base/x509_cert_types\\.'],
1115 ['include', '^base/x509_util_ios\\.'],
1094 ['include', '^http/http_byte_range\\.'], 1116 ['include', '^http/http_byte_range\\.'],
1095 ['include', '^http/http_content_disposition\\.'], 1117 ['include', '^http/http_content_disposition\\.'],
1096 ['include', '^http/http_util\\.'], 1118 ['include', '^http/http_util\\.'],
1097 ['include', '^http/http_util_icu\\.cc$'], 1119 ['include', '^http/http_util_icu\\.cc$'],
1098 ['include', '^http/http_version\\.h$'], 1120 ['include', '^http/http_version\\.h$'],
1099 ['include', '^url_request/url_request_job_manager\\.'], 1121 ['include', '^url_request/url_request_job_manager\\.'],
1100 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'], 1122 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
1101 ['include', '^proxy/polling_proxy_config_service\\.'], 1123 ['include', '^proxy/polling_proxy_config_service\\.'],
1102 ['include', '^proxy/proxy_config\\.'], 1124 ['include', '^proxy/proxy_config\\.'],
1103 ['include', '^proxy/proxy_config_service_ios\\.'], 1125 ['include', '^proxy/proxy_config_service_ios\\.'],
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 'sources/': [ 1160 'sources/': [
1139 ['include', '^base/platform_mime_util_linux\\.cc$'], 1161 ['include', '^base/platform_mime_util_linux\\.cc$'],
1140 ], 1162 ],
1141 }], 1163 }],
1142 ['OS == "ios"', { 1164 ['OS == "ios"', {
1143 'sources/': [ 1165 'sources/': [
1144 ['include', 'base/network_change_notifier_mac\\.cc$'], 1166 ['include', 'base/network_change_notifier_mac\\.cc$'],
1145 ['include', 'base/network_config_watcher_mac\\.cc$'], 1167 ['include', 'base/network_config_watcher_mac\\.cc$'],
1146 ['include', 'base/platform_mime_util_mac\\.mm$'], 1168 ['include', 'base/platform_mime_util_mac\\.mm$'],
1147 ['include', 'proxy/proxy_resolver_mac\\.cc$'], 1169 ['include', 'proxy/proxy_resolver_mac\\.cc$'],
1170 # The iOS implementation only partially uses NSS and thus does not
1171 # defines |use_nss|. In particular the |USE_NSS| preprocessor
1172 # definition is not used. The following files are needed though:
1173 ['include', 'base/x509_certificate_nss_util\\.cc$'],
1174 ['include', 'base/x509_certificate_nss_util\\.h$'],
1148 ], 1175 ],
1149 }], 1176 }],
1150 ], 1177 ],
1151 }, 1178 },
1152 { 1179 {
1153 'target_name': 'net_unittests', 1180 'target_name': 'net_unittests',
1154 'type': '<(gtest_target_type)', 1181 'type': '<(gtest_target_type)',
1155 'dependencies': [ 1182 'dependencies': [
1156 '../base/base.gyp:base', 1183 '../base/base.gyp:base',
1157 '../base/base.gyp:base_i18n', 1184 '../base/base.gyp:base_i18n',
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 }, 1531 },
1505 ], 1532 ],
1506 [ 'OS == "mac"', { 1533 [ 'OS == "mac"', {
1507 'dependencies': [ 1534 'dependencies': [
1508 '../third_party/nss/nss.gyp:nspr', 1535 '../third_party/nss/nss.gyp:nspr',
1509 '../third_party/nss/nss.gyp:nss', 1536 '../third_party/nss/nss.gyp:nss',
1510 'third_party/nss/ssl.gyp:libssl', 1537 'third_party/nss/ssl.gyp:libssl',
1511 ], 1538 ],
1512 }, 1539 },
1513 ], 1540 ],
1514 ['OS == "ios"', { 1541 [ 'OS == "ios"', {
1515 # TODO: For now this only tests the subset of code that is enabled in 1542 # TODO: For now this only tests the subset of code that is enabled
1516 # the net target. 1543 # in the net target.
1517 'dependencies': [ 1544 'dependencies': [
1518 '../testing/gtest.gyp:gtest_main', 1545 '../third_party/nss/nss.gyp:nss',
1519 ], 1546 '../testing/gtest.gyp:gtest_main',
1520 'sources/': [ 1547 ],
1521 ['exclude', '.*'], 1548 'sources/': [
1522 ['include', '^base/dns_util_unittest\\.cc$'], 1549 ['exclude', '.*'],
1523 ['include', '^base/escape_unittest\\.cc$'], 1550 ['include', '^base/dns_util_unittest\\.cc$'],
1524 ['include', '^base/ip_endpoint_unittest\\.cc$'], 1551 ['include', '^base/escape_unittest\\.cc$'],
1525 ['include', '^base/mime_util_unittest\\.cc$'], 1552 ['include', '^base/ip_endpoint_unittest\\.cc$'],
1526 ['include', '^base/net_log_unittest\\.cc$'], 1553 ['include', '^base/mime_util_unittest\\.cc$'],
1527 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'], 1554 ['include', '^base/net_log_unittest\\.cc$'],
1528 ['include', '^http/http_byte_range_unittest\\.cc$'], 1555 ['include', '^base/pem_tokenizer_unittest\\.cc$'],
1529 ['include', '^http/http_content_disposition_unittest\\.cc$'], 1556 ['include', '^base/registry_controlled_domains/registry_controlled _domain_unittest\\.cc$'],
1530 ['include', '^http/http_util_unittest\\.cc$'], 1557 ['include', '^base/x509_certificate_unittest\\.cc$'],
1531 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'], 1558 ['include', '^http/http_byte_range_unittest\\.cc$'],
1532 ], 1559 ['include', '^http/http_content_disposition_unittest\\.cc$'],
1560 ['include', '^http/http_util_unittest\\.cc$'],
1561 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
1562 ],
1533 }], 1563 }],
1534 [ 'OS == "linux"', { 1564 [ 'OS == "linux"', {
1535 'dependencies': [ 1565 'dependencies': [
1536 '../build/linux/system.gyp:dbus', 1566 '../build/linux/system.gyp:dbus',
1537 '../dbus/dbus.gyp:dbus_test_support', 1567 '../dbus/dbus.gyp:dbus_test_support',
1538 ], 1568 ],
1539 }, 1569 },
1540 ], 1570 ],
1541 [ 'OS == "android"', { 1571 [ 'OS == "android"', {
1542 'dependencies': [ 1572 'dependencies': [
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1708 ], 1738 ],
1709 }], 1739 }],
1710 ['OS != "android"', { 1740 ['OS != "android"', {
1711 'sources!': [ 1741 'sources!': [
1712 'test/remote_test_server.cc', 1742 'test/remote_test_server.cc',
1713 'test/remote_test_server.h', 1743 'test/remote_test_server.h',
1714 'test/spawner_communicator.cc', 1744 'test/spawner_communicator.cc',
1715 'test/spawner_communicator.h', 1745 'test/spawner_communicator.h',
1716 ], 1746 ],
1717 }], 1747 }],
1748 ['OS == "ios"', {
1749 'dependencies': [
1750 '../third_party/nss/nss.gyp:nss',
1751 ],
1752 }],
1718 [ 'use_v8_in_net==1', { 1753 [ 'use_v8_in_net==1', {
1719 'dependencies': [ 1754 'dependencies': [
1720 'net_with_v8', 1755 'net_with_v8',
1721 ], 1756 ],
1722 }, 1757 },
1723 ], 1758 ],
1724 ], 1759 ],
1725 }, 1760 },
1726 { 1761 {
1727 'target_name': 'net_resources', 1762 'target_name': 'net_resources',
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
2198 '--result', '<@(_outputs)', 2233 '--result', '<@(_outputs)',
2199 '--isolate', 'net_unittests.isolate', 2234 '--isolate', 'net_unittests.isolate',
2200 ], 2235 ],
2201 }, 2236 },
2202 ], 2237 ],
2203 }, 2238 },
2204 ], 2239 ],
2205 }], 2240 }],
2206 ], 2241 ],
2207 } 2242 }
OLDNEW
« no previous file with comments | « net/base/x509_util_ios.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698