Index: crypto/nss_util.cc |
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc |
index 9020e7eb0a46c3dec04bf4f34c111e3fc1e68b1a..beb6a7ba87cf191e8f5cfb9dc50d246dea0b7e76 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,16 @@ 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_64_BITS) |
+ paths.push_back(FilePath("/usr/lib/x86_64-linux-gnu/nss")); |
awong
2011/10/05 18:07:42
Can we confirm with the ubuntu folks that this nss
wtc
2011/10/06 01:13:18
awong: This is true. The NSS package in Debian de
|
+#elif defined(ARCH_CPU_32_BITS) |
+ paths.push_back(FilePath("/usr/lib/i386-linux-gnu/nss")); |
+#endif |
wtc
2011/10/06 01:06:44
Please test __x86_64__ and __i386__ or our equival
wtc
2011/10/06 17:27:24
It is OK to leave ARM processor support as a TODO.
Lambros
2011/10/06 20:32:19
Done.
|
+ |
// A list of library files to load. |
std::vector<std::string> libs; |
libs.push_back("libsoftokn3.so"); |