commit 24f2676a39bf3d9472cf3d1d96371ffea712fc9c
author Dan Willemsen <dwillemsen@google.com> Tue Oct 23 03:42:09 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 23 03:42:09 2018 +0000
tree ddfcb411bf9ba6bae00591bb51470a8920664f5d
parent 12efefc34b65c59ed4b7ad86e87e299b8dac92b2
parent d4e51a155a08d28c874d47e97ad53f222a64ba1c

Merge "Change crtbrand for host bionic"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index b605ed9..f085863 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1318,6 +1318,15 @@
     }
   }
 
+#if !defined(__ANDROID__)
+  // Bionic on the host currently uses some Android prebuilts, which don't set
+  // DT_RUNPATH with any relative paths, so they can't find their dependencies.
+  // b/118058804
+  if (si->get_dt_runpath().empty()) {
+    si->set_dt_runpath("$ORIGIN/../lib64:$ORIGIN/lib64");
+  }
+#endif
+
   for_each_dt_needed(task->get_elf_reader(), [&](const char* name) {
     load_tasks->push_back(LoadTask::create(name, si, ns, task->get_readers_map()));
   });