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
hylschwy · Dec 11, 2013 · b45ff99 · b45ff99
1 parent 579d7fb
commit b45ff99
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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