Merge changes Ie6777e2b,Iaed834be

* changes:
  Fix for default library path "/vendor/lib"
  Fix bionic-unit-tests

1 files changed, 6 insertions, 1 deletions

diff --git a/linker/linker.cpp b/linker/linker.cpp
index fab64bc1c..b2e8dbc11 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3215,9 +3215,14 @@ void init_default_namespace() {
     g_default_ld_paths = kDefaultLdPaths;
   }
 
+  char real_path[PATH_MAX];
   std::vector<std::string> ld_default_paths;
   for (size_t i = 0; g_default_ld_paths[i] != nullptr; ++i) {
-    ld_default_paths.push_back(g_default_ld_paths[i]);
+    if (realpath(g_default_ld_paths[i], real_path) != nullptr) {
+      ld_default_paths.push_back(real_path);
+    } else {
+      ld_default_paths.push_back(g_default_ld_paths[i]);
+    }
   }
 
   g_default_namespace.set_default_library_paths(std::move(ld_default_paths));