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

Side by Side Diff: net/BUILD.gn

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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 import("//build/config/chromecast_build.gni") 5 import("//build/config/chromecast_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build/module_args/v8.gni") 10 import("//build/module_args/v8.gni")
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 "quic/crypto/scoped_evp_aead_ctx.h", 208 "quic/crypto/scoped_evp_aead_ctx.h",
209 "socket/ssl_client_socket_openssl.cc", 209 "socket/ssl_client_socket_openssl.cc",
210 "socket/ssl_client_socket_openssl.h", 210 "socket/ssl_client_socket_openssl.h",
211 "socket/ssl_server_socket_openssl.cc", 211 "socket/ssl_server_socket_openssl.cc",
212 "socket/ssl_server_socket_openssl.h", 212 "socket/ssl_server_socket_openssl.h",
213 "ssl/openssl_ssl_util.cc", 213 "ssl/openssl_ssl_util.cc",
214 "ssl/openssl_ssl_util.h", 214 "ssl/openssl_ssl_util.h",
215 "ssl/ssl_client_session_cache_openssl.cc", 215 "ssl/ssl_client_session_cache_openssl.cc",
216 "ssl/ssl_client_session_cache_openssl.h", 216 "ssl/ssl_client_session_cache_openssl.h",
217 "ssl/ssl_platform_key.h", 217 "ssl/ssl_platform_key.h",
218 "ssl/ssl_platform_key_task_runner.cc",
219 "ssl/ssl_platform_key_task_runner.h",
218 "ssl/threaded_ssl_private_key.cc", 220 "ssl/threaded_ssl_private_key.cc",
219 "ssl/threaded_ssl_private_key.h", 221 "ssl/threaded_ssl_private_key.h",
220 ] 222 ]
221 if (is_mac) { 223 if (is_mac) {
222 net_shared_sources -= [ "ssl/ssl_platform_key_mac.cc" ] 224 net_shared_sources -= [ "ssl/ssl_platform_key_mac.cc" ]
223 } 225 }
224 if (is_android) { 226 if (is_android) {
225 net_shared_sources -= [ "ssl/ssl_platform_key_android.cc" ] 227 net_shared_sources -= [ "ssl/ssl_platform_key_android.cc" ]
226 } 228 }
227 if (is_win) { 229 if (is_win) {
(...skipping 15 matching lines...) Expand all
243 net_shared_sources -= [ 245 net_shared_sources -= [
244 "base/crypto_module_openssl.cc", 246 "base/crypto_module_openssl.cc",
245 "base/keygen_handler_openssl.cc", 247 "base/keygen_handler_openssl.cc",
246 "base/openssl_private_key_store.h", 248 "base/openssl_private_key_store.h",
247 "base/openssl_private_key_store_memory.cc", 249 "base/openssl_private_key_store_memory.cc",
248 "cert/cert_database_openssl.cc", 250 "cert/cert_database_openssl.cc",
249 "cert/cert_verify_proc_openssl.cc", 251 "cert/cert_verify_proc_openssl.cc",
250 "cert/cert_verify_proc_openssl.h", 252 "cert/cert_verify_proc_openssl.h",
251 "cert/test_root_certs_openssl.cc", 253 "cert/test_root_certs_openssl.cc",
252 "cert/x509_certificate_openssl.cc", 254 "cert/x509_certificate_openssl.cc",
253 "ssl/openssl_client_key_store.cc",
254 "ssl/openssl_client_key_store.h",
255 ] 255 ]
256 if (is_android) { 256 if (is_android) {
257 net_shared_sources -= [ "base/openssl_private_key_store_android.cc" ] 257 net_shared_sources -= [ "base/openssl_private_key_store_android.cc" ]
258 } 258 }
259 } else { 259 } else {
260 if (is_android) { 260 if (is_android) {
261 # Android doesn't use these even when using OpenSSL. 261 # Android doesn't use these even when using OpenSSL.
262 net_shared_sources -= [ 262 net_shared_sources -= [
263 "base/openssl_private_key_store_memory.cc", 263 "base/openssl_private_key_store_memory.cc",
264 "cert/cert_database_openssl.cc", 264 "cert/cert_database_openssl.cc",
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 if (!use_kerberos) { 1455 if (!use_kerberos) {
1456 sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ] 1456 sources -= [ "http/http_auth_handler_negotiate_unittest.cc" ]
1457 } 1457 }
1458 1458
1459 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) { 1459 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
1460 # Only include this test when on Posix and using NSS for 1460 # Only include this test when on Posix and using NSS for
1461 # cert verification or on iOS (which also uses NSS for certs). 1461 # cert verification or on iOS (which also uses NSS for certs).
1462 sources -= [ "cert_net/nss_ocsp_unittest.cc" ] 1462 sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
1463 } 1463 }
1464 1464
1465 if (!use_openssl_certs) {
1466 sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
1467 }
1468
1469 if (!enable_websockets) { 1465 if (!enable_websockets) {
1470 sources -= [ 1466 sources -= [
1471 "server/http_connection_unittest.cc", 1467 "server/http_connection_unittest.cc",
1472 "server/http_server_response_info_unittest.cc", 1468 "server/http_server_response_info_unittest.cc",
1473 "server/http_server_unittest.cc", 1469 "server/http_server_unittest.cc",
1474 "server/web_socket_encoder_unittest.cc", 1470 "server/web_socket_encoder_unittest.cc",
1475 "websockets/websocket_basic_stream_test.cc", 1471 "websockets/websocket_basic_stream_test.cc",
1476 "websockets/websocket_channel_test.cc", 1472 "websockets/websocket_channel_test.cc",
1477 "websockets/websocket_deflate_predictor_impl_test.cc", 1473 "websockets/websocket_deflate_predictor_impl_test.cc",
1478 "websockets/websocket_deflate_stream_test.cc", 1474 "websockets/websocket_deflate_stream_test.cc",
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1670 if (enable_websockets) { 1666 if (enable_websockets) {
1671 sources += [ "websockets/websocket_frame_perftest.cc" ] 1667 sources += [ "websockets/websocket_frame_perftest.cc" ]
1672 } 1668 }
1673 1669
1674 if (use_v8_in_net) { 1670 if (use_v8_in_net) {
1675 deps += [ ":net_with_v8" ] 1671 deps += [ ":net_with_v8" ]
1676 } else { 1672 } else {
1677 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1673 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1678 } 1674 }
1679 } 1675 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698