tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libvndksupport: Do not lookup default namespace for sphal failure" into oc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-05-31 07:01:38 +00:00 committed by Android (Google) Code Review
commit 147743176a
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libvndksupport/linker.c
View file

@ -30,21 +30,17 @@ void* android_load_sphal_library(const char* name, int flag) {
.flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = sphal_namespace,
};
void* handle = android_dlopen_ext(name, flag, &dlextinfo);
if (handle) {
return handle;
} else {
ALOGW(
"Could not load %s from sphal namespace: %s. "
"Falling back to loading it from the current namespace,",
name, dlerror());
if (!handle) {
ALOGE("Could not load %s from sphal namespace: %s.", name, dlerror());
}
return handle;
} else {
ALOGI(
"sphal namespace is not configured for this process. "
"Loading %s from the current namespace instead.",
name);
return dlopen(name, flag);
}
return dlopen(name, flag);
}
int android_unload_sphal_library(void* handle) { return dlclose(handle); }