diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 01:33:58 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 01:33:58 +0000 |
| commit | 26661c2a9e997b01f9a4b47f81c41148dd32c0a5 (patch) | |
| tree | 2583b1f324ac42ab954276fd80f13b1b968fc76c /crypto | |
| parent | 0ee7ff1fc752b0e7d4b10447bb994bb5e7575571 (diff) | |
| download | chromium_src-26661c2a9e997b01f9a4b47f81c41148dd32c0a5.zip chromium_src-26661c2a9e997b01f9a4b47f81c41148dd32c0a5.tar.gz chromium_src-26661c2a9e997b01f9a4b47f81c41148dd32c0a5.tar.bz2 | |
Fix library paths for preloading NSS on Ubuntu 11.10.
BUG=99053,91962
TEST=Manual
Review URL: http://codereview.chromium.org/8143012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/nss_util.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 9020e7e..4998125 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -29,6 +29,7 @@ #include "base/native_library.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #include "crypto/scoped_nss_types.h" #if defined(OS_CHROMEOS) @@ -650,9 +651,18 @@ void LoadNSSLibraries() { // Use relative path to Search PATH for the library files. paths.push_back(FilePath()); - // For Debian derivaties NSS libraries are located here. + // For Debian derivatives NSS libraries are located here. paths.push_back(FilePath("/usr/lib/nss")); + // Ubuntu 11.10 (Oneiric) places the libraries here. +#if defined(ARCH_CPU_X86_64) + paths.push_back(FilePath("/usr/lib/x86_64-linux-gnu/nss")); +#elif defined(ARCH_CPU_X86) + paths.push_back(FilePath("/usr/lib/i386-linux-gnu/nss")); +#elif defined(ARCH_CPU_ARMEL) + paths.push_back(FilePath("/usr/lib/arm-linux-gnueabi/nss")); +#endif + // A list of library files to load. std::vector<std::string> libs; libs.push_back("libsoftokn3.so"); @@ -675,7 +685,7 @@ void LoadNSSLibraries() { if (loaded == libs.size()) { VLOG(3) << "NSS libraries loaded."; } else { - LOG(WARNING) << "Failed to load NSS libraries."; + LOG(ERROR) << "Failed to load NSS libraries."; } #endif } |