commit 7b85fb0d393c3119501779176b532b37182b0584
author Roland Levillain <rpl@google.com> Wed Jul 03 10:51:02 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 03 10:51:02 2019 +0000
tree 8dfd9b6ec485b5b8509d5860ec2a5498db402d25
parent afce4e897fdd8ed29bcfacf552216e1e106409c0
parent dc25f6c717dfa2d611d2b8bf49d47bc5e660928f

Merge "Use an APEX's linker configuration for any executable under its `bin` directory."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9bb6557..55d684f 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -4082,10 +4082,10 @@
   return namespaces;
 }
 
-// return /apex/<name>/etc/ld.config.txt from /apex/<name>/bin/<exec>
+// return /apex/<name>/etc/ld.config.txt from /apex/<name>/bin/*
 static std::string get_ld_config_file_apex_path(const char* executable_path) {
   std::vector<std::string> paths = android::base::Split(executable_path, "/");
-  if (paths.size() == 5 && paths[1] == "apex" && paths[3] == "bin") {
+  if (paths.size() >= 5 && paths[1] == "apex" && paths[3] == "bin") {
     return std::string("/apex/") + paths[2] + "/etc/ld.config.txt";
   }
   return "";