commit 9b82136b987bc01224e3b42732334ea27c97d188
author Dmitriy Ivanov <dimitry@google.com> Thu Apr 02 16:03:56 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri Apr 03 10:50:48 2015 -0700
tree 036facba010c670c5d6bfc3fa9dbb2de0f28caf8
parent ab7c79e22e5495a2aa171047a044ce1037e461a9

Add ANDROID_DLEXT_FORCE_LOAD flag

  This flag allows to force loading of the library
  in the case when for some reason multiple ELF files
  share the same filename (because the already-loaded
  library has been removed and overwritten, for example).

Change-Id: I798d44409ee13d63eaa75d685e99c4d028d2b0c1

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index ebf125e..8703e4f 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1014,16 +1014,18 @@
   }
 
   // Check for symlink and other situations where
-  // file can have different names.
-  for (soinfo* si = solist; si != nullptr; si = si->next) {
-    if (si->get_st_dev() != 0 &&
-        si->get_st_ino() != 0 &&
-        si->get_st_dev() == file_stat.st_dev &&
-        si->get_st_ino() == file_stat.st_ino &&
-        si->get_file_offset() == file_offset) {
-      TRACE("library \"%s\" is already loaded under different name/path \"%s\" - "
-          "will return existing soinfo", name, si->name);
-      return si;
+  // file can have different names, unless ANDROID_DLEXT_FORCE_LOAD is set
+  if (extinfo == nullptr || (extinfo->flags & ANDROID_DLEXT_FORCE_LOAD) == 0) {
+    for (soinfo* si = solist; si != nullptr; si = si->next) {
+      if (si->get_st_dev() != 0 &&
+          si->get_st_ino() != 0 &&
+          si->get_st_dev() == file_stat.st_dev &&
+          si->get_st_ino() == file_stat.st_ino &&
+          si->get_file_offset() == file_offset) {
+        TRACE("library \"%s\" is already loaded under different name/path \"%s\" - "
+            "will return existing soinfo", name, si->name);
+        return si;
+      }
     }
   }