Merge "Use an APEX's linker configuration for any executable under its `bin` directory."
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 "";