commit e35872605b2cd8ebadb7984a93ee38c42aafdffd
author Dimitry Ivanov <dimitry@google.com> Wed Oct 05 16:20:44 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 05 16:20:45 2016 +0000
tree a47afc3b1fea48a1eb789a05aa589ad13196cbb3
parent 1ba0e27462ff1b2e80457d6cb100b448afe6d10e
parent 2589f9de6473a2030594e2c5e95541f00eb2dc7a

Merge changes Ie6777e2b,Iaed834be

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

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index fab64bc..b2e8dbc 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3215,9 +3215,14 @@
     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));

tests/libs/Android.bp

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 8283633..e1a4239 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -18,7 +18,7 @@
     name: "bionic_testlib_defaults",
     host_supported: true,
     ldflags: [
-        "-Wl,--rpath,\\$${ORIGIN}",
+        "-Wl,--rpath,${ORIGIN}",
         "-Wl,--enable-new-dtags",
     ],
     relative_install_path: "bionic-loader-test-libs",