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

Unified Diff: net/net.gypi

Issue 2291213002: Remove ENGINE indirection from Android SSLPrivateKey. (Closed)
Patch Set: Fix WebView build Created 4 years, 4 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/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index 3144494e6b76aae3588c1b0bef1ecbe691a89e76..60b02252ca3f62344d0d6c30f7ab6165c6370ea3 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -245,8 +245,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',
@@ -1341,7 +1339,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',
@@ -1847,6 +1844,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',

Powered by Google App Engine
This is Rietveld 408576698