diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-10-05 16:20:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-05 16:20:45 +0000 |
| commit | e35872605b2cd8ebadb7984a93ee38c42aafdffd (patch) | |
| tree | a47afc3b1fea48a1eb789a05aa589ad13196cbb3 | |
| parent | 1ba0e27462ff1b2e80457d6cb100b448afe6d10e (diff) | |
| parent | 2589f9de6473a2030594e2c5e95541f00eb2dc7a (diff) | |
Merge changes Ie6777e2b,Iaed834be
* changes:
Fix for default library path "/vendor/lib"
Fix bionic-unit-tests
| -rw-r--r-- | linker/linker.cpp | 7 | ||||
| -rw-r--r-- | tests/libs/Android.bp | 2 |
2 files changed, 7 insertions, 2 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)); diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp index 82836336d..e1a423921 100644 --- a/tests/libs/Android.bp +++ b/tests/libs/Android.bp @@ -18,7 +18,7 @@ cc_defaults { 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", |