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

Side by Side Diff: net/net_common.gypi

Issue 1422573008: Plumbing SSLPrivateKey (//net) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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
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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 'socket/ssl_server_socket_openssl.cc', 158 'socket/ssl_server_socket_openssl.cc',
159 'socket/ssl_server_socket_openssl.h', 159 'socket/ssl_server_socket_openssl.h',
160 'ssl/client_key_store.cc', 160 'ssl/client_key_store.cc',
161 'ssl/client_key_store.h', 161 'ssl/client_key_store.h',
162 'ssl/openssl_ssl_util.cc', 162 'ssl/openssl_ssl_util.cc',
163 'ssl/openssl_ssl_util.h', 163 'ssl/openssl_ssl_util.h',
164 'ssl/ssl_client_session_cache_openssl.cc', 164 'ssl/ssl_client_session_cache_openssl.cc',
165 'ssl/ssl_client_session_cache_openssl.h', 165 'ssl/ssl_client_session_cache_openssl.h',
166 'ssl/ssl_platform_key.h', 166 'ssl/ssl_platform_key.h',
167 'ssl/ssl_platform_key_nss.cc', 167 'ssl/ssl_platform_key_nss.cc',
168 'ssl/ssl_platform_key_task_runner.h',
davidben 2015/11/06 21:47:45 Missing ssl/ssl_platform_key_task_runner.cc?
svaldez 2015/11/09 17:32:16 Done.
168 'ssl/threaded_ssl_private_key.cc', 169 'ssl/threaded_ssl_private_key.cc',
169 'ssl/threaded_ssl_private_key.h', 170 'ssl/threaded_ssl_private_key.h',
170 ], 171 ],
171 }, 172 },
172 ], 173 ],
173 [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', { 174 [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', {
174 'conditions': [ 175 'conditions': [
175 # Pull in the bundled or system NSS as appropriate. 176 # Pull in the bundled or system NSS as appropriate.
176 [ 'desktop_linux == 1 or chromeos == 1', { 177 [ 'desktop_linux == 1 or chromeos == 1', {
177 'dependencies': [ 178 'dependencies': [
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 ['include', '^cert/test_root_certs_nss\\.cc$'], 399 ['include', '^cert/test_root_certs_nss\\.cc$'],
399 ['include', '^cert/x509_util_nss_certs\\.cc$'], 400 ['include', '^cert/x509_util_nss_certs\\.cc$'],
400 ['include', '^cert_net/nss_ocsp\\.cc$'], 401 ['include', '^cert_net/nss_ocsp\\.cc$'],
401 ['include', '^cert_net/nss_ocsp\\.h$'], 402 ['include', '^cert_net/nss_ocsp\\.h$'],
402 ['include', '^proxy/proxy_resolver_mac\\.cc$'], 403 ['include', '^proxy/proxy_resolver_mac\\.cc$'],
403 ['include', '^proxy/proxy_server_mac\\.cc$'], 404 ['include', '^proxy/proxy_server_mac\\.cc$'],
404 ], 405 ],
405 }], 406 }],
406 ], 407 ],
407 } 408 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698