commit d2c81ed000c08d6b5e98a65e488ca74e9516be97
author Dimitry Ivanov <dimitry@google.com> Wed Jun 17 21:34:25 2015 +0000
committer Dimitry Ivanov <dimitry@google.com> Wed Jun 17 21:34:25 2015 +0000
tree d7f03538c127ebf5d4c6b27b9ed76f75c366e35e
parent 455c145e3c451b2b6dc00663e4040d79acefd496

Revert "Improve library lookup logic"

This reverts commit 455c145e3c451b2b6dc00663e4040d79acefd496.

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

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index ee4f2d4..8480ab7 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1393,19 +1393,7 @@
     return nullptr;
   }
 
-  uint32_t target_sdk_version = get_application_target_sdk_version();
-
   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();
     if (soname != nullptr && (strcmp(name, soname) == 0)) {
       return si;

linker/linker_sdk_versions.cpp

diff --git a/linker/linker_sdk_versions.cpp b/linker/linker_sdk_versions.cpp
index 9aebb06..e9ad3dc 100644
--- a/linker/linker_sdk_versions.cpp
+++ b/linker/linker_sdk_versions.cpp
@@ -21,10 +21,6 @@
 static std::atomic<uint32_t> g_target_sdk_version(__ANDROID_API__);
 
 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;
 }