Merge "Use /system/lib64 and /vendor/lib64 for 64-bit libraries."

2013-10-08 21:50:34 +00:00 · 2013-10-08 21:50:34 +00:00 · 242b2e0b92
commit 242b2e0b92
parent 58522099e5 011bc0ba45
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
 };