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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 11316210: Implement TestRootCerts for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: address Ryan remarks Created 8 years 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
« net/base/test_root_certs.h ('K') | « net/base/test_root_certs_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 1798d6a22b4aad367b1f196d5f7e87fe366b760c..7e73f5720054fbba7801b9cd3760543ca49f9cb5 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -274,6 +274,7 @@
'base/test_root_certs_mac.cc',
'base/test_root_certs_nss.cc',
'base/test_root_certs_openssl.cc',
+ 'base/test_root_certs_android.cc',
'base/test_root_certs_win.cc',
'base/transport_security_state.cc',
'base/transport_security_state.h',
@@ -1194,8 +1195,9 @@
],
'sources!': [
'base/openssl_memory_private_key_store.cc',
+ 'base/test_root_certs_openssl.cc',
],
- }, { # else OS! = "android"
+ }, { # else OS != "android"
'defines': [
# These are the features Android doesn't support.
'ENABLE_MEDIA_CODEC_THEORA',
« net/base/test_root_certs.h ('K') | « net/base/test_root_certs_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698