| commit | a9703332f6a2983ca40781e1e943c539d053d814 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Tue Jun 16 15:38:21 2015 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Wed Jun 17 17:16:44 2015 -0700 |
| tree | 668314838922ac2081c301c278dfd420c6d056a2 | |
| parent | 9ae6f794cae7280385dfa172b12b7bd110f24693 [diff] [blame] |
Improve library lookup logic Linker tries to open a library even if it can be found by soname. This only happens if the library was previously opened under different target sdk version. 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: I7dbbcc3b49933bffd89ca0af55371e1a1f2bf4c2 (cherry picked from commit 28154f5c56dc4a64270cae2374b47a168d1bd7fa)
diff --git a/linker/linker_sdk_versions.cpp b/linker/linker_sdk_versions.cpp index e9ad3dc..9aebb06 100644 --- a/linker/linker_sdk_versions.cpp +++ b/linker/linker_sdk_versions.cpp
@@ -21,6 +21,10 @@ 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; }