openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libvndksupport: Do not lookup default namespace for sphal failure 

Instead of looking up default namespace for the failure of loading
sphal libs, report failure. This is only for the devices that have
sphal namespace.

Bug: 38435840
Test: sailfish builds and boots
Test: libvndksupport-tests passes
Change-Id: Ibbff5f2d5d83f6482f98677a5492777db6416967
Merged-In: Ibbff5f2d5d83f6482f98677a5492777db6416967
(cherry picked from commit 17baed1012)
This commit is contained in:
Justin Yun 2017-05-22 14:31:56 +09:00
parent e57b353597
commit 7a1d8a10a8
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); }