pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Improve library lookup logic" 

This reverts commit 455c145e3c.

Bug: http://b/21876587
Bug: http://b/21153477
Bug: http://b/21171302
Bug: https://code.google.com/p/android/issues/detail?id=160921
Change-Id: Iad21ddfc1ac749d12bcb52384a8d937b307dd03b
This commit is contained in:
Dimitry Ivanov 2015-06-17 21:34:25 +00:00
parent 455c145e3c
commit d2c81ed000
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linker/linker.cpp
View File

@ -1393,19 +1393,7 @@ static soinfo *find_loaded_library_by_soname(const char* name) {
return nullptr; return nullptr;
} }
uint32_t target_sdk_version = get_application_target_sdk_version();
for (soinfo* si = solist; si != nullptr; si = si->next) { for (soinfo* si = solist; si != nullptr; si = si->next) {
// If the library was opened under different target sdk version
// skip this step and try to reopen it. The exceptions are
// "libdl.so" and global group. There is no point in skipping
// them because relocation process is going to use them
// in any case.
if (si != solist && (si->get_dt_flags_1() & DF_1_GLOBAL) == 0 &&
si->is_linked() && si->get_target_sdk_version() != target_sdk_version) {
continue;
}
const char* soname = si->get_soname(); const char* soname = si->get_soname();
if (soname != nullptr && (strcmp(name, soname) == 0)) { if (soname != nullptr && (strcmp(name, soname) == 0)) {
return si; return si;

4
linker/linker_sdk_versions.cpp
View File

@ -21,10 +21,6 @@
static std::atomic<uint32_t> g_target_sdk_version(__ANDROID_API__); static std::atomic<uint32_t> g_target_sdk_version(__ANDROID_API__);
void set_application_target_sdk_version(uint32_t target) { void set_application_target_sdk_version(uint32_t target) {
// translate current sdk_version to platform sdk_version
if (target == 0) {
target = __ANDROID_API__;
}
g_target_sdk_version = target; g_target_sdk_version = target;
} }