am 97368e82: am 242b2e0b: Merge "Use /system/lib64 and /vendor/lib64 for 64-bit libraries."

* commit '97368e823250fcc0b48f6f392df77c275bf3c5e1': Use /system/lib64 and /vendor/lib64 for 64-bit libraries.
2013-10-08 14:54:01 -07:00 · 2013-10-08 14:54:01 -07:00 · caa0deeefb
commit caa0deeefb
parent 6260fa5025 97368e8232
1 changed files with 5 additions and 0 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@ -90,8 +90,13 @@ static soinfo* sonext = &libdl_info;
 static soinfo* somain; /* main process, always the one after libdl_info */

 static const char* const gSoPaths[] = {
+#if __LP64__
+  "/vendor/lib64",
+  "/system/lib64",
+#else
  "/vendor/lib",
  "/system/lib",
+#endif
  NULL
 };