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

Unified Diff: net/BUILD.gn

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index c21196bf88c2d44111a80bfcdf31edb67460d8fb..0ee9439c7a0368adb308968554e4debfeddf1210 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -215,6 +215,8 @@ if (!is_nacl) {
"ssl/ssl_client_session_cache_openssl.cc",
"ssl/ssl_client_session_cache_openssl.h",
"ssl/ssl_platform_key.h",
+ "ssl/ssl_platform_key_task_runner.cc",
+ "ssl/ssl_platform_key_task_runner.h",
"ssl/threaded_ssl_private_key.cc",
"ssl/threaded_ssl_private_key.h",
]
@@ -238,7 +240,6 @@ if (!is_nacl) {
]
}
}
-
davidben 2015/09/25 20:10:11 Stray change?
svaldez 2015/09/28 16:54:52 Done.
if (!use_openssl_certs) {
net_shared_sources -= [
"base/crypto_module_openssl.cc",
@@ -250,8 +251,6 @@ if (!is_nacl) {
"cert/cert_verify_proc_openssl.h",
"cert/test_root_certs_openssl.cc",
"cert/x509_certificate_openssl.cc",
- "ssl/openssl_client_key_store.cc",
- "ssl/openssl_client_key_store.h",
]
if (is_android) {
net_shared_sources -= [ "base/openssl_private_key_store_android.cc" ]
@@ -1462,10 +1461,6 @@ test("net_unittests") {
sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
}
- if (!use_openssl_certs) {
- sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
- }
-
if (!enable_websockets) {
sources -= [
"server/http_connection_unittest.cc",

Powered by Google App Engine
This is Rietveld 408576698