diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 04:53:35 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 04:53:35 +0000 |
| commit | b45ff99b226694d46b9b8b5f34759ba67e557173 (patch) | |
| tree | a6c9a6e56b66faef354f0ce896914c1e2e4749a2 /crypto | |
| parent | 579d7fbf8bf35dae4c9ad3e4c37f0f5283205931 (diff) | |
| download | chromium_src-b45ff99b226694d46b9b8b5f34759ba67e557173.zip chromium_src-b45ff99b226694d46b9b8b5f34759ba67e557173.tar.gz chromium_src-b45ff99b226694d46b9b8b5f34759ba67e557173.tar.bz2 | |
Fix location of NSS library on armhf linux.
BUG=327453
TEST=arm linux trybot
Review URL: https://codereview.chromium.org/111713006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/nss_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 5a33b6c..7479585 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -880,7 +880,11 @@ void LoadNSSLibraries() { #elif defined(ARCH_CPU_X86) paths.push_back(base::FilePath("/usr/lib/i386-linux-gnu/nss")); #elif defined(ARCH_CPU_ARMEL) +#if defined(__ARM_PCS_VFP) + paths.push_back(base::FilePath("/usr/lib/arm-linux-gnueabihf/nss")); +#else paths.push_back(base::FilePath("/usr/lib/arm-linux-gnueabi/nss")); +#endif #elif defined(ARCH_CPU_MIPSEL) paths.push_back(base::FilePath("/usr/lib/mipsel-linux-gnu/nss")); #endif |