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

Merge "Work around incorrect dt_needed entries"

Browse Source
This commit is contained in:
Dmitriy Ivanov
2015-05-28 22:25:15 +00:00
committed by Gerrit Code Review
parent d717b1a3e5 d974e88046
commit 6c2dba8651
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linker/dlfcn.cpp
View File

@@ -158,6 +158,8 @@ int dlclose(void* handle) {
} }
void android_set_application_target_sdk_version(uint32_t target) { void android_set_application_target_sdk_version(uint32_t target) {
// lock to avoid modification in the middle of dlopen.
ScopedPthreadMutexLocker locker(&g_dl_mutex);
set_application_target_sdk_version(target); set_application_target_sdk_version(target);
} }

18
linker/linker.cpp
View File

@@ -1200,11 +1200,27 @@ static int open_library(const char* name, off64_t* file_offset) {
return fd; return fd;
} }
static const char* fix_dt_needed(const char* dt_needed, const char* sopath __unused) {
#if !defined(__LP64__)
// Work around incorrect DT_NEEDED entries for old apps: http://b/21364029
uint32_t target_sdk_version = get_application_target_sdk_version();
if (target_sdk_version != 0 && target_sdk_version <= 22) {
const char* bname = basename(dt_needed);
if (bname != dt_needed) {
DL_WARN("'%s' library has invalid DT_NEEDED entry '%s'", sopath, dt_needed);
}
return bname;
}
#endif
return dt_needed;
}
template<typename F> template<typename F>
static void for_each_dt_needed(const soinfo* si, F action) { static void for_each_dt_needed(const soinfo* si, F action) {
for (ElfW(Dyn)* d = si->dynamic; d->d_tag != DT_NULL; ++d) { for (ElfW(Dyn)* d = si->dynamic; d->d_tag != DT_NULL; ++d) {
if (d->d_tag == DT_NEEDED) { if (d->d_tag == DT_NEEDED) {
action(si->get_string(d->d_un.d_val)); action(fix_dt_needed(si->get_string(d->d_un.d_val), si->get_realpath()));
} }
} }
} }