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

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: Revert unneeded changes 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
« net/base/x509_util_nss.cc ('K') | « net/base/x509_util_nss.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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 'base/winsock_init.cc', 286 'base/winsock_init.cc',
287 'base/winsock_init.h', 287 'base/winsock_init.h',
288 'base/winsock_util.cc', 288 'base/winsock_util.cc',
289 'base/winsock_util.h', 289 'base/winsock_util.h',
290 'base/x509_cert_types.cc', 290 'base/x509_cert_types.cc',
291 'base/x509_cert_types.h', 291 'base/x509_cert_types.h',
292 'base/x509_cert_types_mac.cc', 292 'base/x509_cert_types_mac.cc',
293 'base/x509_cert_types_win.cc', 293 'base/x509_cert_types_win.cc',
294 'base/x509_certificate.cc', 294 'base/x509_certificate.cc',
295 'base/x509_certificate.h', 295 'base/x509_certificate.h',
296 'base/x509_certificate_ios.cc',
296 'base/x509_certificate_mac.cc', 297 'base/x509_certificate_mac.cc',
297 'base/x509_certificate_net_log_param.cc', 298 'base/x509_certificate_net_log_param.cc',
298 'base/x509_certificate_net_log_param.h', 299 'base/x509_certificate_net_log_param.h',
299 'base/x509_certificate_nss.cc', 300 'base/x509_certificate_nss.cc',
300 'base/x509_certificate_openssl.cc', 301 'base/x509_certificate_openssl.cc',
301 'base/x509_certificate_win.cc', 302 'base/x509_certificate_win.cc',
302 'base/x509_util.h', 303 'base/x509_util.h',
304 'base/x509_util_ios.cc',
305 'base/x509_util_ios.h',
303 'base/x509_util_mac.cc', 306 'base/x509_util_mac.cc',
304 'base/x509_util_mac.h', 307 'base/x509_util_mac.h',
305 'base/x509_util_nss.cc', 308 'base/x509_util_nss.cc',
306 'base/x509_util_nss.h', 309 'base/x509_util_nss.h',
307 'base/x509_util_openssl.cc', 310 'base/x509_util_openssl.cc',
308 'base/x509_util_openssl.h', 311 'base/x509_util_openssl.h',
309 'base/zap.cc', 312 'base/zap.cc',
310 'base/zap.h', 313 'base/zap.h',
311 'cookies/canonical_cookie.cc', 314 'cookies/canonical_cookie.cc',
312 'cookies/canonical_cookie.h', 315 'cookies/canonical_cookie.h',
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 'libraries': [ 1066 'libraries': [
1064 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 1067 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1065 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1068 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1066 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1069 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1067 '$(SDKROOT)/usr/lib/libresolv.dylib', 1070 '$(SDKROOT)/usr/lib/libresolv.dylib',
1068 ] 1071 ]
1069 }, 1072 },
1070 }, 1073 },
1071 ], 1074 ],
1072 [ 'OS == "ios"', { 1075 [ 'OS == "ios"', {
1076 'dependencies': [
1077 '../third_party/nss/nss.gyp:nss',
1078 'third_party/nss/ssl.gyp:libssl',
1079 ],
1073 'link_settings': { 1080 'link_settings': {
1074 'libraries': [ 1081 'libraries': [
1075 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', 1082 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
1076 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk', 1083 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk',
1084 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1077 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1085 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1078 '$(SDKROOT)/usr/lib/libresolv.dylib', 1086 '$(SDKROOT)/usr/lib/libresolv.dylib',
1079 ], 1087 ],
1080 }, 1088 },
1081 'sources/': [ 1089 'sources/': [
1082 # 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
1083 # compiled on iOS, just enough to bring up the dependencies needed 1091 # compiled on iOS, just enough to bring up the dependencies needed
1084 # by the ui target. 1092 # by the ui target.
1085 ['exclude', '.*'], 1093 ['exclude', '.*'],
1094 ['include', '^base/asn1_util\\.'],
1086 ['include', '^base/dns_util\\.'], 1095 ['include', '^base/dns_util\\.'],
1087 ['include', '^base/escape\\.'], 1096 ['include', '^base/escape\\.'],
1097 ['include', '^base/ev_root_ca_metadata\\.'],
1088 ['include', '^base/ip_endpoint\\.'], 1098 ['include', '^base/ip_endpoint\\.'],
1089 ['include', '^base/mime_util\\.'], 1099 ['include', '^base/mime_util\\.'],
1090 ['include', '^base/net_errors\\.'], 1100 ['include', '^base/net_errors\\.'],
1091 ['include', '^base/network_change_notifier\\.'], 1101 ['include', '^base/network_change_notifier\\.'],
1092 ['include', '^base/net_errors_posix\\.cc$'], 1102 ['include', '^base/net_errors_posix\\.cc$'],
1093 ['include', '^base/net_export\\.h$'], 1103 ['include', '^base/net_export\\.h$'],
1094 ['include', '^base/net_log\\.'], 1104 ['include', '^base/net_log\\.'],
1095 ['include', '^base/net_module\\.'], 1105 ['include', '^base/net_module\\.'],
1096 ['include', '^base/net_util\\.'], 1106 ['include', '^base/net_util\\.'],
1097 ['include', '^base/net_util_posix\\.cc$'], 1107 ['include', '^base/net_util_posix\\.cc$'],
1098 ['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$'],
1099 ['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\\.'],
1100 ['include', '^http/http_byte_range\\.'], 1116 ['include', '^http/http_byte_range\\.'],
1101 ['include', '^http/http_content_disposition\\.'], 1117 ['include', '^http/http_content_disposition\\.'],
1102 ['include', '^http/http_util\\.'], 1118 ['include', '^http/http_util\\.'],
1103 ['include', '^http/http_util_icu\\.cc$'], 1119 ['include', '^http/http_util_icu\\.cc$'],
1104 ['include', '^http/http_version\\.h$'], 1120 ['include', '^http/http_version\\.h$'],
1105 ['include', '^url_request/url_request_job_manager\\.'], 1121 ['include', '^url_request/url_request_job_manager\\.'],
1106 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'], 1122 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
1107 ['include', '^proxy/polling_proxy_config_service\\.'], 1123 ['include', '^proxy/polling_proxy_config_service\\.'],
1108 ['include', '^proxy/proxy_config\\.'], 1124 ['include', '^proxy/proxy_config\\.'],
1109 ['include', '^proxy/proxy_config_service_ios\\.'], 1125 ['include', '^proxy/proxy_config_service_ios\\.'],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 'sources/': [ 1168 'sources/': [
1153 ['include', '^base/platform_mime_util_linux\\.cc$'], 1169 ['include', '^base/platform_mime_util_linux\\.cc$'],
1154 ], 1170 ],
1155 }], 1171 }],
1156 ['OS == "ios"', { 1172 ['OS == "ios"', {
1157 'sources/': [ 1173 'sources/': [
1158 ['include', 'base/network_change_notifier_mac\\.cc$'], 1174 ['include', 'base/network_change_notifier_mac\\.cc$'],
1159 ['include', 'base/network_config_watcher_mac\\.cc$'], 1175 ['include', 'base/network_config_watcher_mac\\.cc$'],
1160 ['include', 'base/platform_mime_util_mac\\.mm$'], 1176 ['include', 'base/platform_mime_util_mac\\.mm$'],
1161 ['include', 'proxy/proxy_resolver_mac\\.cc$'], 1177 ['include', 'proxy/proxy_resolver_mac\\.cc$'],
1178 # The iOS implementation only partially uses NSS and thus does not
1179 # defines |use_nss|. In particular the |USE_NSS| preprocessor
1180 # definition is not used. The following files are needed though:
1181 ['include', 'base/x509_util_nss\\.cc$'],
1182 ['include', 'base/x509_util_nss\\.h$'],
1162 ], 1183 ],
1163 }], 1184 }],
1164 ], 1185 ],
1165 }, 1186 },
1166 { 1187 {
1167 'target_name': 'net_unittests', 1188 'target_name': 'net_unittests',
1168 'type': '<(gtest_target_type)', 1189 'type': '<(gtest_target_type)',
1169 'dependencies': [ 1190 'dependencies': [
1170 '../base/base.gyp:base', 1191 '../base/base.gyp:base',
1171 '../base/base.gyp:base_i18n', 1192 '../base/base.gyp:base_i18n',
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 }, 1539 },
1519 ], 1540 ],
1520 [ 'OS == "mac"', { 1541 [ 'OS == "mac"', {
1521 'dependencies': [ 1542 'dependencies': [
1522 '../third_party/nss/nss.gyp:nspr', 1543 '../third_party/nss/nss.gyp:nspr',
1523 '../third_party/nss/nss.gyp:nss', 1544 '../third_party/nss/nss.gyp:nss',
1524 'third_party/nss/ssl.gyp:libssl', 1545 'third_party/nss/ssl.gyp:libssl',
1525 ], 1546 ],
1526 }, 1547 },
1527 ], 1548 ],
1528 ['OS == "ios"', { 1549 [ 'OS == "ios"', {
1529 # TODO: For now this only tests the subset of code that is enabled in 1550 # TODO: For now this only tests the subset of code that is enabled
1530 # the net target. 1551 # in the net target.
1531 'dependencies': [ 1552 'dependencies': [
1532 '../testing/gtest.gyp:gtest_main', 1553 '../third_party/nss/nss.gyp:nss',
1533 ], 1554 '../testing/gtest.gyp:gtest_main',
1534 'sources/': [ 1555 ],
1535 ['exclude', '.*'], 1556 'sources/': [
1536 ['include', '^base/dns_util_unittest\\.cc$'], 1557 ['exclude', '.*'],
1537 ['include', '^base/escape_unittest\\.cc$'], 1558 ['include', '^base/dns_util_unittest\\.cc$'],
1538 ['include', '^base/ip_endpoint_unittest\\.cc$'], 1559 ['include', '^base/escape_unittest\\.cc$'],
1539 ['include', '^base/mime_util_unittest\\.cc$'], 1560 ['include', '^base/ip_endpoint_unittest\\.cc$'],
1540 ['include', '^base/net_log_unittest\\.cc$'], 1561 ['include', '^base/mime_util_unittest\\.cc$'],
1541 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'], 1562 ['include', '^base/net_log_unittest\\.cc$'],
1542 ['include', '^http/http_byte_range_unittest\\.cc$'], 1563 ['include', '^base/pem_tokenizer_unittest\\.cc$'],
1543 ['include', '^http/http_content_disposition_unittest\\.cc$'], 1564 ['include', '^base/registry_controlled_domains/registry_controlled _domain_unittest\\.cc$'],
1544 ['include', '^http/http_util_unittest\\.cc$'], 1565 ['include', '^base/x509_certificate_unittest\\.cc$'],
1545 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'], 1566 ['include', '^http/http_byte_range_unittest\\.cc$'],
1546 ], 1567 ['include', '^http/http_content_disposition_unittest\\.cc$'],
1568 ['include', '^http/http_util_unittest\\.cc$'],
1569 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
1570 ],
1547 }], 1571 }],
1548 [ 'OS == "linux"', { 1572 [ 'OS == "linux"', {
1549 'dependencies': [ 1573 'dependencies': [
1550 '../build/linux/system.gyp:dbus', 1574 '../build/linux/system.gyp:dbus',
1551 '../dbus/dbus.gyp:dbus_test_support', 1575 '../dbus/dbus.gyp:dbus_test_support',
1552 ], 1576 ],
1553 }, 1577 },
1554 ], 1578 ],
1555 [ 'OS == "android"', { 1579 [ 'OS == "android"', {
1556 'dependencies': [ 1580 'dependencies': [
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1722 ], 1746 ],
1723 }], 1747 }],
1724 ['OS != "android"', { 1748 ['OS != "android"', {
1725 'sources!': [ 1749 'sources!': [
1726 'test/remote_test_server.cc', 1750 'test/remote_test_server.cc',
1727 'test/remote_test_server.h', 1751 'test/remote_test_server.h',
1728 'test/spawner_communicator.cc', 1752 'test/spawner_communicator.cc',
1729 'test/spawner_communicator.h', 1753 'test/spawner_communicator.h',
1730 ], 1754 ],
1731 }], 1755 }],
1756 ['OS == "ios"', {
1757 'dependencies': [
1758 '../third_party/nss/nss.gyp:nss',
1759 ],
1760 }],
1732 [ 'use_v8_in_net==1', { 1761 [ 'use_v8_in_net==1', {
1733 'dependencies': [ 1762 'dependencies': [
1734 'net_with_v8', 1763 'net_with_v8',
1735 ], 1764 ],
1736 }, 1765 },
1737 ], 1766 ],
1738 ], 1767 ],
1739 }, 1768 },
1740 { 1769 {
1741 'target_name': 'net_resources', 1770 'target_name': 'net_resources',
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 '--result', '<@(_outputs)', 2277 '--result', '<@(_outputs)',
2249 '--isolate', 'net_unittests.isolate', 2278 '--isolate', 'net_unittests.isolate',
2250 ], 2279 ],
2251 }, 2280 },
2252 ], 2281 ],
2253 }, 2282 },
2254 ], 2283 ],
2255 }], 2284 }],
2256 ], 2285 ],
2257 } 2286 }
OLDNEW
« net/base/x509_util_nss.cc ('K') | « net/base/x509_util_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698