ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libvndksupport: do not use functions from android/dlext.h" am: 865f9c2f0a am: 9dbbfdc1a5

Browse source 
am: 13e202c56d

Change-Id: Ibd768abc912c943118e044dc425cc2c3d943fcfb
This commit is contained in:
Yifan Hong 2017-11-10 23:51:49 +00:00 • committed by android-build-merger
commit 30e791faa7
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libvndksupport/linker.c
View file

@ -21,7 +21,8 @@
#define LOG_TAG "vndksupport"
#include <log/log.h>
extern struct android_namespace_t* android_get_exported_namespace(const char*);
__attribute__((weak)) extern struct android_namespace_t* android_get_exported_namespace(const char*);
__attribute__((weak)) extern void* android_dlopen_ext(const char*, int, const android_dlextinfo*);
static const char* namespace_name = NULL;
@ -31,7 +32,9 @@ static struct android_namespace_t* get_vendor_namespace() {
if (vendor_namespace == NULL) {
int name_idx = 0;
while (namespace_names[name_idx] != NULL) {
vendor_namespace = android_get_exported_namespace(namespace_names[name_idx]);
if (android_get_exported_namespace != NULL) {
vendor_namespace = android_get_exported_namespace(namespace_names[name_idx]);
}
if (vendor_namespace != NULL) {
namespace_name = namespace_names[name_idx];
break;
@ -48,7 +51,10 @@ void* android_load_sphal_library(const char* name, int flag) {
const android_dlextinfo dlextinfo = {
.flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = vendor_namespace,
};
void* handle = android_dlopen_ext(name, flag, &dlextinfo);
void* handle = NULL;
if (android_dlopen_ext != NULL) {
handle = android_dlopen_ext(name, flag, &dlextinfo);
}
if (!handle) {
ALOGE("Could not load %s from %s namespace: %s.", name, namespace_name, dlerror());
}