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

Unified Diff: net/net.gypi

Issue 2291213002: Remove ENGINE indirection from Android SSLPrivateKey. (Closed)
Patch Set: re-delete undeleted files Created 4 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
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/ssl/openssl_client_key_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index 0a07e4fe581d8fcd243e7972ec5e9fa4fa851e0a..ef1b889db469434b2c469d984db3f0402efa5a63 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -247,8 +247,6 @@
'android/http_auth_negotiate_android.h',
'android/keystore.cc',
'android/keystore.h',
- 'android/keystore_openssl.cc',
- 'android/keystore_openssl.h',
'android/legacy_openssl.h',
'android/net_jni_registrar.cc',
'android/net_jni_registrar.h',
@@ -1343,7 +1341,6 @@
'android/dummy_spnego_authenticator.cc',
'android/dummy_spnego_authenticator.h',
'android/http_auth_negotiate_android_unittest.cc',
- 'android/keystore_unittest.cc',
'android/network_change_notifier_android_unittest.cc',
'android/traffic_stats_unittest.cc',
'base/address_family_unittest.cc',
@@ -1852,6 +1849,7 @@
'ssl/ssl_config_service_unittest.cc',
'ssl/ssl_config_unittest.cc',
'ssl/ssl_connection_status_flags_unittest.cc',
+ 'ssl/ssl_platform_key_android_unittest.cc',
'test/embedded_test_server/embedded_test_server_unittest.cc',
'test/embedded_test_server/http_request_unittest.cc',
'test/embedded_test_server/http_response_unittest.cc',
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/ssl/openssl_client_key_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698