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

Side by Side Diff: net/net_common.gypi

Issue 1810153002: Adding iOS OpenSSL Implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplifying logic for first iteration. Created 4 years, 9 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/cert/x509_certificate_openssl_ios.cc ('K') | « net/net.gypi ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 # This target is included in both 'net' and 'net_small'. 6 # This target is included in both 'net' and 'net_small'.
7 'type': '<(component)', 7 'type': '<(component)',
8 'variables': { 'enable_wexit_time_destructors': 1, }, 8 'variables': { 'enable_wexit_time_destructors': 1, },
9 'dependencies': [ 9 'dependencies': [
10 '../base/base.gyp:base', 10 '../base/base.gyp:base',
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 ], 297 ],
298 # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's 298 # client_cert_store_nss.c requires NSS_CmpCertChainWCANames from NSS's
299 # libssl, but our bundled copy is not built in OpenSSL ports. Pull that 299 # libssl, but our bundled copy is not built in OpenSSL ports. Pull that
300 # file in directly. 300 # file in directly.
301 [ 'use_nss_certs == 1 and use_openssl == 1', { 301 [ 'use_nss_certs == 1 and use_openssl == 1', {
302 'sources': [ 302 'sources': [
303 'third_party/nss/ssl/cmpcert.c', 303 'third_party/nss/ssl/cmpcert.c',
304 ], 304 ],
305 }], 305 }],
306 [ 'OS == "ios" and use_nss_verifier == 0', { 306 [ 'OS == "ios" and use_nss_verifier == 0', {
307 'sources': [
308 'cert/test_root_cert_mac.cc',
davidben 2016/03/21 19:46:47 Huh. Does test_root_cert_mac.cc normally get exclu
svaldez 2016/03/21 20:23:52 Yup. Also had to move it due to ordering of platfo
309 ],
307 'sources!': [ 310 'sources!': [
308 'cert/x509_util_ios.cc', 311 'cert/x509_util_ios.cc',
309 'cert/x509_util_ios.h', 312 'cert/x509_util_ios.h',
310 ], 313 ],
311 }], 314 }],
315 [ 'OS == "ios" and use_nss_verifier == 1', {
316 'sources!': [
317 'cert/cert_verify_proc_openssl_ios.cc',
318 'cert/cert_verify_proc_openssl_ios.h',
319 'cert/x509_certificate_openssl_ios.cc',
320 ],
321 }],
312 [ 'enable_websockets == 1', { 322 [ 'enable_websockets == 1', {
313 'sources': ['<@(net_websockets_sources)'] 323 'sources': ['<@(net_websockets_sources)']
314 }], 324 }],
315 [ 'enable_mdns != 1', { 325 [ 'enable_mdns != 1', {
316 'sources!' : [ 326 'sources!' : [
317 'dns/mdns_cache.cc', 327 'dns/mdns_cache.cc',
318 'dns/mdns_cache.h', 328 'dns/mdns_cache.h',
319 'dns/mdns_client.cc', 329 'dns/mdns_client.cc',
320 'dns/mdns_client.h', 330 'dns/mdns_client.h',
321 'dns/mdns_client_impl.cc', 331 'dns/mdns_client_impl.cc',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 ['include', '^base/network_config_watcher_mac\\.cc$'], 431 ['include', '^base/network_config_watcher_mac\\.cc$'],
422 ['include', '^base/network_interfaces_mac\\.cc$'], 432 ['include', '^base/network_interfaces_mac\\.cc$'],
423 ['include', '^base/network_interfaces_mac\\.h$'], 433 ['include', '^base/network_interfaces_mac\\.h$'],
424 ['include', '^base/platform_mime_util_mac\\.mm$'], 434 ['include', '^base/platform_mime_util_mac\\.mm$'],
425 ['include', '^proxy/proxy_resolver_mac\\.cc$'], 435 ['include', '^proxy/proxy_resolver_mac\\.cc$'],
426 ['include', '^proxy/proxy_server_mac\\.cc$'], 436 ['include', '^proxy/proxy_server_mac\\.cc$'],
427 ], 437 ],
428 }], 438 }],
429 ], 439 ],
430 } 440 }
OLDNEW
« net/cert/x509_certificate_openssl_ios.cc ('K') | « net/net.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698