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

Side by Side Diff: net/net_common.gypi

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing unused function in Android. Created 5 years, 2 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
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'socket/ssl_server_socket_openssl.cc', 160 'socket/ssl_server_socket_openssl.cc',
161 'socket/ssl_server_socket_openssl.h', 161 'socket/ssl_server_socket_openssl.h',
162 'ssl/client_key_store.cc', 162 'ssl/client_key_store.cc',
163 'ssl/client_key_store.h', 163 'ssl/client_key_store.h',
164 'ssl/openssl_ssl_util.cc', 164 'ssl/openssl_ssl_util.cc',
165 'ssl/openssl_ssl_util.h', 165 'ssl/openssl_ssl_util.h',
166 'ssl/ssl_client_session_cache_openssl.cc', 166 'ssl/ssl_client_session_cache_openssl.cc',
167 'ssl/ssl_client_session_cache_openssl.h', 167 'ssl/ssl_client_session_cache_openssl.h',
168 'ssl/ssl_platform_key.h', 168 'ssl/ssl_platform_key.h',
169 'ssl/ssl_platform_key_nss.cc', 169 'ssl/ssl_platform_key_nss.cc',
170 'ssl/ssl_platform_key_task_runner.h',
170 'ssl/threaded_ssl_private_key.cc', 171 'ssl/threaded_ssl_private_key.cc',
171 'ssl/threaded_ssl_private_key.h', 172 'ssl/threaded_ssl_private_key.h',
172 ], 173 ],
173 }, 174 },
174 ], 175 ],
175 [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', { 176 [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', {
176 'conditions': [ 177 'conditions': [
177 # Pull in the bundled or system NSS as appropriate. 178 # Pull in the bundled or system NSS as appropriate.
178 [ 'desktop_linux == 1 or chromeos == 1', { 179 [ 'desktop_linux == 1 or chromeos == 1', {
179 'dependencies': [ 180 'dependencies': [
(...skipping 18 matching lines...) Expand all
198 'base/crypto_module_openssl.cc', 199 'base/crypto_module_openssl.cc',
199 'base/keygen_handler_openssl.cc', 200 'base/keygen_handler_openssl.cc',
200 'base/openssl_private_key_store.h', 201 'base/openssl_private_key_store.h',
201 'base/openssl_private_key_store_android.cc', 202 'base/openssl_private_key_store_android.cc',
202 'base/openssl_private_key_store_memory.cc', 203 'base/openssl_private_key_store_memory.cc',
203 'cert/cert_database_openssl.cc', 204 'cert/cert_database_openssl.cc',
204 'cert/cert_verify_proc_openssl.cc', 205 'cert/cert_verify_proc_openssl.cc',
205 'cert/cert_verify_proc_openssl.h', 206 'cert/cert_verify_proc_openssl.h',
206 'cert/test_root_certs_openssl.cc', 207 'cert/test_root_certs_openssl.cc',
207 'cert/x509_certificate_openssl.cc', 208 'cert/x509_certificate_openssl.cc',
208 'ssl/openssl_client_key_store.cc',
209 'ssl/openssl_client_key_store.h',
210 ], 209 ],
211 }], 210 }],
212 [ 'use_glib == 1', { 211 [ 'use_glib == 1', {
213 'dependencies': [ 212 'dependencies': [
214 '../build/linux/system.gyp:gconf', 213 '../build/linux/system.gyp:gconf',
215 '../build/linux/system.gyp:gio', 214 '../build/linux/system.gyp:gio',
216 ], 215 ],
217 }], 216 }],
218 [ 'desktop_linux == 1 or chromeos == 1', { 217 [ 'desktop_linux == 1 or chromeos == 1', {
219 'conditions': [ 218 'conditions': [
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 ['include', '^cert/test_root_certs_nss\\.cc$'], 399 ['include', '^cert/test_root_certs_nss\\.cc$'],
401 ['include', '^cert/x509_util_nss_certs\\.cc$'], 400 ['include', '^cert/x509_util_nss_certs\\.cc$'],
402 ['include', '^cert_net/nss_ocsp\\.cc$'], 401 ['include', '^cert_net/nss_ocsp\\.cc$'],
403 ['include', '^cert_net/nss_ocsp\\.h$'], 402 ['include', '^cert_net/nss_ocsp\\.h$'],
404 ['include', '^proxy/proxy_resolver_mac\\.cc$'], 403 ['include', '^proxy/proxy_resolver_mac\\.cc$'],
405 ['include', '^proxy/proxy_server_mac\\.cc$'], 404 ['include', '^proxy/proxy_server_mac\\.cc$'],
406 ], 405 ],
407 }], 406 }],
408 ], 407 ],
409 } 408 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698