diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-10 03:23:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-10 03:23:02 +0000 |
commit | c021b75cfd067963eb40d18b6be893cdde60943f (patch) | |
tree | a99d55794bc1ed938dc4da0dc69263fe44dd1997 | |
parent | 93e5cd85d1aa5d3075281093c07a3acee67b0b11 (diff) | |
parent | 090b593a8d65caeafc88f0323698f8f93a986fa5 (diff) | |
download | system_core-c021b75cfd067963eb40d18b6be893cdde60943f.tar.gz system_core-c021b75cfd067963eb40d18b6be893cdde60943f.tar.bz2 system_core-c021b75cfd067963eb40d18b6be893cdde60943f.zip |
Merge changes from topic "libvndksupport_cp"
* changes:
Make libvndksupport look for default namespace as well.
libvndksupport: Change log level and message.
-rw-r--r-- | libvndksupport/linker.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/libvndksupport/linker.c b/libvndksupport/linker.c index 696e97817..d06cafc8e 100644 --- a/libvndksupport/linker.c +++ b/libvndksupport/linker.c @@ -23,24 +23,38 @@ extern struct android_namespace_t* android_get_exported_namespace(const char*); +static const char* namespace_name = NULL; + +static struct android_namespace_t* get_vendor_namespace() { + const char* namespace_names[] = {"sphal", "default", NULL}; + static struct android_namespace_t* vendor_namespace = NULL; + 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 (vendor_namespace != NULL) { + namespace_name = namespace_names[name_idx]; + break; + } + name_idx++; + } + } + return vendor_namespace; +} + void* android_load_sphal_library(const char* name, int flag) { - struct android_namespace_t* sphal_namespace = android_get_exported_namespace("sphal"); - if (sphal_namespace != NULL) { + struct android_namespace_t* vendor_namespace = get_vendor_namespace(); + if (vendor_namespace != NULL) { const android_dlextinfo dlextinfo = { - .flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = sphal_namespace, + .flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = vendor_namespace, }; void* handle = android_dlopen_ext(name, flag, &dlextinfo); if (!handle) { - ALOGE( - "Could not load %s from sphal namespace: %s. ", - name, dlerror()); + ALOGE("Could not load %s from %s namespace: %s.", name, namespace_name, dlerror()); } return handle; } else { - ALOGI( - "sphal namespace is not configured for this process. " - "Loading %s from the current namespace instead.", - name); + ALOGD("Loading %s from current namespace instead of sphal namespace.", name); return dlopen(name, flag); } } |