Commit bd952f3a authored by mattm@chromium.org's avatar mattm@chromium.org

net/ compile fixes for for chromeos use_openssl=1 build.

BUG=338888

Review URL: https://codereview.chromium.org/201673006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262925 0039d316-1c4b-4281-b951-d872f2087c98
parent 28733cea
...@@ -31,8 +31,8 @@ class KeygenHandlerTest : public ::testing::Test { ...@@ -31,8 +31,8 @@ class KeygenHandlerTest : public ::testing::Test {
virtual ~KeygenHandlerTest() {} virtual ~KeygenHandlerTest() {}
virtual void SetUp() { virtual void SetUp() {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS) && defined(USE_NSS)
crypto::OpenPersistentNSSDB(); crypto::OpenPersistentNSSDB();
#endif #endif
} }
}; };
......
...@@ -1381,6 +1381,10 @@ ...@@ -1381,6 +1381,10 @@
'cert/jwk_serializer_nss.cc', 'cert/jwk_serializer_nss.cc',
'cert/nss_cert_database.cc', 'cert/nss_cert_database.cc',
'cert/nss_cert_database.h', 'cert/nss_cert_database.h',
'cert/nss_cert_database_chromeos.cc',
'cert/nss_cert_database_chromeos.h',
'cert/nss_profile_filter_chromeos.cc',
'cert/nss_profile_filter_chromeos.h',
'cert/scoped_nss_types.h', 'cert/scoped_nss_types.h',
'cert/test_root_certs_nss.cc', 'cert/test_root_certs_nss.cc',
'cert/x509_certificate_nss.cc', 'cert/x509_certificate_nss.cc',
...@@ -1519,6 +1523,8 @@ ...@@ -1519,6 +1523,8 @@
'cert/cert_verify_proc_nss.h', 'cert/cert_verify_proc_nss.h',
'ssl/client_cert_store_nss.cc', 'ssl/client_cert_store_nss.cc',
'ssl/client_cert_store_nss.h', 'ssl/client_cert_store_nss.h',
'ssl/client_cert_store_chromeos.cc',
'ssl/client_cert_store_chromeos.h',
], ],
}], }],
[ 'enable_websockets != 1', { [ 'enable_websockets != 1', {
...@@ -2199,6 +2205,7 @@ ...@@ -2199,6 +2205,7 @@
[ 'use_nss != 1', { [ 'use_nss != 1', {
'sources!': [ 'sources!': [
'ssl/client_cert_store_nss_unittest.cc', 'ssl/client_cert_store_nss_unittest.cc',
'ssl/client_cert_store_chromeos_unittest.cc',
], ],
}], }],
[ 'use_openssl == 1', { [ 'use_openssl == 1', {
...@@ -2263,6 +2270,8 @@ ...@@ -2263,6 +2270,8 @@
'cert/ct_objects_extractor_unittest.cc', 'cert/ct_objects_extractor_unittest.cc',
'cert/multi_log_ct_verifier_unittest.cc', 'cert/multi_log_ct_verifier_unittest.cc',
'cert/nss_cert_database_unittest.cc', 'cert/nss_cert_database_unittest.cc',
'cert/nss_cert_database_chromeos_unittest.cc',
'cert/nss_profile_filter_chromeos_unittest.cc',
'cert/x509_util_nss_unittest.cc', 'cert/x509_util_nss_unittest.cc',
'quic/test_tools/crypto_test_utils_nss.cc', 'quic/test_tools/crypto_test_utils_nss.cc',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment