diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 15:08:40 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 15:08:40 +0000 |
| commit | bf37b1d8ba2b7308b2b356112e614f0dbe195dd0 (patch) | |
| tree | 23a35d3e6e7212f7c3c12a6697e537b6e2b21b63 | |
| parent | f425f7c824b213f35cd3fb8f68defd10599c1325 (diff) | |
| download | chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.zip chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.tar.gz chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.tar.bz2 | |
openssl build fixes, and tidy the build files
Split out of http://codereview.chromium.org/4691003/
BUG=None
TEST=builds...
Review URL: http://codereview.chromium.org/4696004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65801 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/linux/system.gyp | 7 | ||||
| -rw-r--r-- | chrome/common/net/url_fetcher_unittest.cc | 6 | ||||
| -rw-r--r-- | net/base/net_test_suite.h | 6 | ||||
| -rw-r--r-- | net/net.gyp | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 271feef..cf25bb1 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -331,11 +331,8 @@ ['use_openssl==1', { 'direct_dependent_settings': { 'defines': [ - # OpenSSL support is in development. - # eventually USE_OPENSSL and USE_NSS will be mutually exclusive. - # During the transitional period, a use_openssl=1 build still - # needs to define USE_NSS, so it is necessary to test the - # USE_OPENSSL macro before testing USE_NSS. + # OpenSSL support is incomplete: http://crbug.com/62803. + # Defining USE_OPENSSL disables USE_NSS. 'USE_OPENSSL', ], 'include_dirs': [ diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc index 466d8e6..65fb3c5 100644 --- a/chrome/common/net/url_fetcher_unittest.cc +++ b/chrome/common/net/url_fetcher_unittest.cc @@ -15,7 +15,7 @@ #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_LINUX) +#if defined(USE_NSS) #include "net/ocsp/nss_ocsp.h" #endif @@ -79,13 +79,13 @@ class URLFetcherTest : public testing::Test, public URLFetcher::Delegate { // Ensure that any plugin operations done by other tests are cleaned up. ChromePluginLib::UnloadAllPlugins(); -#if defined(OS_LINUX) +#if defined(USE_NSS) net::EnsureOCSPInit(); #endif } virtual void TearDown() { -#if defined(OS_LINUX) +#if defined(USE_NSS) net::ShutdownOCSP(); #endif } diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h index 00d9844..8ebc4e7 100644 --- a/net/base/net_test_suite.h +++ b/net/base/net_test_suite.h @@ -11,7 +11,9 @@ #include "base/test/test_suite.h" #include "build/build_config.h" #include "net/base/mock_host_resolver.h" +#if defined(USE_NSS) #include "net/ocsp/nss_ocsp.h" +#endif class NetTestSuite : public base::TestSuite { public: @@ -41,9 +43,9 @@ class NetTestSuite : public base::TestSuite { } virtual void Shutdown() { -#if defined(OS_LINUX) +#if defined(USE_NSS) net::ShutdownOCSP(); -#endif // defined(OS_LINUX) +#endif // We want to destroy this here before the TestSuite continues to tear down // the environment. diff --git a/net/net.gyp b/net/net.gyp index 306ee2b..5fa9d6a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -724,6 +724,8 @@ }], ['use_openssl==1', { 'sources!': [ + 'ocsp/nss_ocsp.cc', + 'ocsp/nss_ocsp.h', 'socket/dns_cert_provenance_check.cc', 'socket/dns_cert_provenance_check.h', 'socket/ssl_client_socket_nss.cc', |