generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ANDROID_DLEXT_FORCE_LOAD flag

Browse Source 
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
This commit is contained in:
Dmitriy Ivanov
2015-04-02 16:03:56 -07:00
parent ab7c79e22e
commit 9b82136b98
3 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
linker/linker.cpp
View File

@@ -1014,16 +1014,18 @@ static soinfo* load_library(LoadTaskList& load_tasks,
}
// 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;
}
}
}