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

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: Fix windows compilation 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_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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 'base/winsock_init.cc', 292 'base/winsock_init.cc',
293 'base/winsock_init.h', 293 'base/winsock_init.h',
294 'base/winsock_util.cc', 294 'base/winsock_util.cc',
295 'base/winsock_util.h', 295 'base/winsock_util.h',
296 'base/x509_cert_types.cc', 296 'base/x509_cert_types.cc',
297 'base/x509_cert_types.h', 297 'base/x509_cert_types.h',
298 'base/x509_cert_types_mac.cc', 298 'base/x509_cert_types_mac.cc',
299 'base/x509_cert_types_win.cc', 299 'base/x509_cert_types_win.cc',
300 'base/x509_certificate.cc', 300 'base/x509_certificate.cc',
301 'base/x509_certificate.h', 301 'base/x509_certificate.h',
302 'base/x509_certificate_ios.cc',
302 'base/x509_certificate_mac.cc', 303 'base/x509_certificate_mac.cc',
303 'base/x509_certificate_net_log_param.cc', 304 'base/x509_certificate_net_log_param.cc',
304 'base/x509_certificate_net_log_param.h', 305 'base/x509_certificate_net_log_param.h',
305 'base/x509_certificate_nss.cc', 306 'base/x509_certificate_nss.cc',
306 'base/x509_certificate_openssl.cc', 307 'base/x509_certificate_openssl.cc',
307 'base/x509_certificate_win.cc', 308 'base/x509_certificate_win.cc',
308 'base/x509_util.h', 309 'base/x509_util.h',
310 'base/x509_util_ios.cc',
311 'base/x509_util_ios.h',
309 'base/x509_util_mac.cc', 312 'base/x509_util_mac.cc',
310 'base/x509_util_mac.h', 313 'base/x509_util_mac.h',
311 'base/x509_util_nss.cc', 314 'base/x509_util_nss.cc',
312 'base/x509_util_nss.h', 315 'base/x509_util_nss.h',
313 'base/x509_util_openssl.cc', 316 'base/x509_util_openssl.cc',
314 'base/x509_util_openssl.h', 317 'base/x509_util_openssl.h',
315 'base/zap.cc', 318 'base/zap.cc',
316 'base/zap.h', 319 'base/zap.h',
317 'cookies/canonical_cookie.cc', 320 'cookies/canonical_cookie.cc',
318 'cookies/canonical_cookie.h', 321 'cookies/canonical_cookie.h',
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 'libraries': [ 1072 'libraries': [
1070 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 1073 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1071 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1074 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1072 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1075 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1073 '$(SDKROOT)/usr/lib/libresolv.dylib', 1076 '$(SDKROOT)/usr/lib/libresolv.dylib',
1074 ] 1077 ]
1075 }, 1078 },
1076 }, 1079 },
1077 ], 1080 ],
1078 [ 'OS == "ios"', { 1081 [ 'OS == "ios"', {
1082 'dependencies': [
1083 '../third_party/nss/nss.gyp:nss',
1084 'third_party/nss/ssl.gyp:libssl',
1085 ],
1079 'link_settings': { 1086 'link_settings': {
1080 'libraries': [ 1087 'libraries': [
1081 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', 1088 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
1082 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk', 1089 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framewo rk',
1090 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1083 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1091 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1084 '$(SDKROOT)/usr/lib/libresolv.dylib', 1092 '$(SDKROOT)/usr/lib/libresolv.dylib',
1085 ], 1093 ],
1086 }, 1094 },
1087 'sources/': [ 1095 'sources/': [
1088 # TODO(ios): Right now there is only a very limited subset of net 1096 # TODO(ios): Right now there is only a very limited subset of net
1089 # compiled on iOS, just enough to bring up the dependencies needed 1097 # compiled on iOS, just enough to bring up the dependencies needed
1090 # by the ui target. 1098 # by the ui target.
1091 ['exclude', '.*'], 1099 ['exclude', '.*'],
1100 ['include', '^base/asn1_util\\.'],
1092 ['include', '^base/dns_util\\.'], 1101 ['include', '^base/dns_util\\.'],
1093 ['include', '^base/escape\\.'], 1102 ['include', '^base/escape\\.'],
1103 ['include', '^base/ev_root_ca_metadata\\.'],
1094 ['include', '^base/ip_endpoint\\.'], 1104 ['include', '^base/ip_endpoint\\.'],
1095 ['include', '^base/mime_util\\.'], 1105 ['include', '^base/mime_util\\.'],
1096 ['include', '^base/net_errors\\.'], 1106 ['include', '^base/net_errors\\.'],
1097 ['include', '^base/network_change_notifier\\.'], 1107 ['include', '^base/network_change_notifier\\.'],
1098 ['include', '^base/net_errors_posix\\.cc$'], 1108 ['include', '^base/net_errors_posix\\.cc$'],
1099 ['include', '^base/net_export\\.h$'], 1109 ['include', '^base/net_export\\.h$'],
1100 ['include', '^base/net_log\\.'], 1110 ['include', '^base/net_log\\.'],
1101 ['include', '^base/net_module\\.'], 1111 ['include', '^base/net_module\\.'],
1102 ['include', '^base/net_util\\.'], 1112 ['include', '^base/net_util\\.'],
1103 ['include', '^base/net_util_posix\\.cc$'], 1113 ['include', '^base/net_util_posix\\.cc$'],
1104 ['include', '^base/platform_mime_util\\.h$'], 1114 ['include', '^base/platform_mime_util\\.h$'],
1115 ['include', '^base/pem_tokenizer\\.cc$'],
1116 ['include', '^base/pem_tokenizer\\.h$'],
1105 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'], 1117 ['include', '^base/registry_controlled_domains/registry_controlled _domain\\.'],
1118 ['include', '^base/x509_certificate\\.'],
1119 ['include', '^base/x509_certificate_ios\\.'],
1120 ['include', '^base/x509_cert_types\\.'],
1121 ['include', '^base/x509_util_ios\\.'],
1106 ['include', '^http/http_byte_range\\.'], 1122 ['include', '^http/http_byte_range\\.'],
1107 ['include', '^http/http_content_disposition\\.'], 1123 ['include', '^http/http_content_disposition\\.'],
1108 ['include', '^http/http_util\\.'], 1124 ['include', '^http/http_util\\.'],
1109 ['include', '^http/http_util_icu\\.cc$'], 1125 ['include', '^http/http_util_icu\\.cc$'],
1110 ['include', '^http/http_version\\.h$'], 1126 ['include', '^http/http_version\\.h$'],
1111 ['include', '^url_request/url_request_job_manager\\.'], 1127 ['include', '^url_request/url_request_job_manager\\.'],
1112 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'], 1128 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
1113 ['include', '^proxy/polling_proxy_config_service\\.'], 1129 ['include', '^proxy/polling_proxy_config_service\\.'],
1114 ['include', '^proxy/proxy_config\\.'], 1130 ['include', '^proxy/proxy_config\\.'],
1115 ['include', '^proxy/proxy_config_service_ios\\.'], 1131 ['include', '^proxy/proxy_config_service_ios\\.'],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 'sources/': [ 1174 'sources/': [
1159 ['include', '^base/platform_mime_util_linux\\.cc$'], 1175 ['include', '^base/platform_mime_util_linux\\.cc$'],
1160 ], 1176 ],
1161 }], 1177 }],
1162 ['OS == "ios"', { 1178 ['OS == "ios"', {
1163 'sources/': [ 1179 'sources/': [
1164 ['include', 'base/network_change_notifier_mac\\.cc$'], 1180 ['include', 'base/network_change_notifier_mac\\.cc$'],
1165 ['include', 'base/network_config_watcher_mac\\.cc$'], 1181 ['include', 'base/network_config_watcher_mac\\.cc$'],
1166 ['include', 'base/platform_mime_util_mac\\.mm$'], 1182 ['include', 'base/platform_mime_util_mac\\.mm$'],
1167 ['include', 'proxy/proxy_resolver_mac\\.cc$'], 1183 ['include', 'proxy/proxy_resolver_mac\\.cc$'],
1184 # The iOS implementation only partially uses NSS and thus does not
1185 # defines |use_nss|. In particular the |USE_NSS| preprocessor
1186 # definition is not used. The following files are needed though:
1187 ['include', 'base/x509_util_nss\\.cc$'],
1188 ['include', 'base/x509_util_nss\\.h$'],
1168 ], 1189 ],
1169 }], 1190 }],
1170 ], 1191 ],
1171 }, 1192 },
1172 { 1193 {
1173 'target_name': 'net_unittests', 1194 'target_name': 'net_unittests',
1174 'type': '<(gtest_target_type)', 1195 'type': '<(gtest_target_type)',
1175 'dependencies': [ 1196 'dependencies': [
1176 '../base/base.gyp:base', 1197 '../base/base.gyp:base',
1177 '../base/base.gyp:base_i18n', 1198 '../base/base.gyp:base_i18n',
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 }, 1547 },
1527 ], 1548 ],
1528 [ 'OS == "mac"', { 1549 [ 'OS == "mac"', {
1529 'dependencies': [ 1550 'dependencies': [
1530 '../third_party/nss/nss.gyp:nspr', 1551 '../third_party/nss/nss.gyp:nspr',
1531 '../third_party/nss/nss.gyp:nss', 1552 '../third_party/nss/nss.gyp:nss',
1532 'third_party/nss/ssl.gyp:libssl', 1553 'third_party/nss/ssl.gyp:libssl',
1533 ], 1554 ],
1534 }, 1555 },
1535 ], 1556 ],
1536 ['OS == "ios"', { 1557 [ 'OS == "ios"', {
1537 # TODO: For now this only tests the subset of code that is enabled in 1558 # TODO: For now this only tests the subset of code that is enabled
1538 # the net target. 1559 # in the net target.
1539 'dependencies': [ 1560 'dependencies': [
1540 '../testing/gtest.gyp:gtest_main', 1561 '../third_party/nss/nss.gyp:nss',
1541 ], 1562 '../testing/gtest.gyp:gtest_main',
1542 'sources/': [ 1563 ],
1543 ['exclude', '.*'], 1564 'sources/': [
1544 ['include', '^base/dns_util_unittest\\.cc$'], 1565 ['exclude', '.*'],
1545 ['include', '^base/escape_unittest\\.cc$'], 1566 ['include', '^base/dns_util_unittest\\.cc$'],
1546 ['include', '^base/ip_endpoint_unittest\\.cc$'], 1567 ['include', '^base/escape_unittest\\.cc$'],
1547 ['include', '^base/mime_util_unittest\\.cc$'], 1568 ['include', '^base/ip_endpoint_unittest\\.cc$'],
1548 ['include', '^base/net_log_unittest\\.cc$'], 1569 ['include', '^base/mime_util_unittest\\.cc$'],
1549 ['include', '^base/registry_controlled_domains/registry_controlled_d omain_unittest\\.cc$'], 1570 ['include', '^base/net_log_unittest\\.cc$'],
1550 ['include', '^http/http_byte_range_unittest\\.cc$'], 1571 ['include', '^base/pem_tokenizer_unittest\\.cc$'],
1551 ['include', '^http/http_content_disposition_unittest\\.cc$'], 1572 ['include', '^base/registry_controlled_domains/registry_controlled _domain_unittest\\.cc$'],
1552 ['include', '^http/http_util_unittest\\.cc$'], 1573 ['include', '^base/x509_certificate_unittest\\.cc$'],
1553 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'], 1574 ['include', '^http/http_byte_range_unittest\\.cc$'],
1554 ], 1575 ['include', '^http/http_content_disposition_unittest\\.cc$'],
1576 ['include', '^http/http_util_unittest\\.cc$'],
1577 ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
1578 ],
1555 }], 1579 }],
1556 [ 'OS == "linux"', { 1580 [ 'OS == "linux"', {
1557 'dependencies': [ 1581 'dependencies': [
1558 '../build/linux/system.gyp:dbus', 1582 '../build/linux/system.gyp:dbus',
1559 '../dbus/dbus.gyp:dbus_test_support', 1583 '../dbus/dbus.gyp:dbus_test_support',
1560 ], 1584 ],
1561 }, 1585 },
1562 ], 1586 ],
1563 [ 'OS == "android"', { 1587 [ 'OS == "android"', {
1564 'dependencies': [ 1588 'dependencies': [
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1730 ], 1754 ],
1731 }], 1755 }],
1732 ['OS != "android"', { 1756 ['OS != "android"', {
1733 'sources!': [ 1757 'sources!': [
1734 'test/remote_test_server.cc', 1758 'test/remote_test_server.cc',
1735 'test/remote_test_server.h', 1759 'test/remote_test_server.h',
1736 'test/spawner_communicator.cc', 1760 'test/spawner_communicator.cc',
1737 'test/spawner_communicator.h', 1761 'test/spawner_communicator.h',
1738 ], 1762 ],
1739 }], 1763 }],
1764 ['OS == "ios"', {
1765 'dependencies': [
1766 '../third_party/nss/nss.gyp:nss',
1767 ],
1768 }],
1740 [ 'use_v8_in_net==1', { 1769 [ 'use_v8_in_net==1', {
1741 'dependencies': [ 1770 'dependencies': [
1742 'net_with_v8', 1771 'net_with_v8',
1743 ], 1772 ],
1744 }, 1773 },
1745 ], 1774 ],
1746 ], 1775 ],
1747 }, 1776 },
1748 { 1777 {
1749 'target_name': 'net_resources', 1778 'target_name': 'net_resources',
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 '--result', '<@(_outputs)', 2285 '--result', '<@(_outputs)',
2257 '--isolate', 'net_unittests.isolate', 2286 '--isolate', 'net_unittests.isolate',
2258 ], 2287 ],
2259 }, 2288 },
2260 ], 2289 ],
2261 }, 2290 },
2262 ], 2291 ],
2263 }], 2292 }],
2264 ], 2293 ],
2265 } 2294 }
OLDNEW
« no previous file with comments | « net/base/x509_util_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698