diff options
author | Jiyong Park <jiyong@google.com> | 2017-08-16 23:30:42 +0900 |
---|---|---|
committer | Jae Shin <jaeshin@google.com> | 2017-10-26 05:21:57 +0000 |
commit | 0f70905b7d58ce46a3cae7a7eb2f60cc92e7fb34 (patch) | |
tree | 1ce0ae3e39ef77234622db9ba40496d0e05b5fff /renderscript | |
parent | cd769859090b02d23d01990a73d300ccaf026fe3 (diff) | |
download | android_hardware_interfaces-0f70905b7d58ce46a3cae7a7eb2f60cc92e7fb34.tar.gz android_hardware_interfaces-0f70905b7d58ce46a3cae7a7eb2f60cc92e7fb34.tar.bz2 android_hardware_interfaces-0f70905b7d58ce46a3cae7a7eb2f60cc92e7fb34.zip |
Load libRS_internal.so from the rs namespace
Bug: 64747884
Test: VtsHalRenderscriptV1_0TargetTest successful on the device built
with BOARD_VNDK_VERSION=current and [system] namespace config is applied
to /data/nativetest[64]/* processes.
Merged-In: I9e967c80ac2dba718cd47e1f378bcbf18abe9ad2
Change-Id: I9e967c80ac2dba718cd47e1f378bcbf18abe9ad2
(cherry picked from commit a7ef697a0a520015f961012d53d852a8cece20df)
Diffstat (limited to 'renderscript')
-rw-r--r-- | renderscript/1.0/default/Device.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/renderscript/1.0/default/Device.cpp b/renderscript/1.0/default/Device.cpp index 3aae06097..4831a8b98 100644 --- a/renderscript/1.0/default/Device.cpp +++ b/renderscript/1.0/default/Device.cpp @@ -1,6 +1,9 @@ #include "Context.h" #include "Device.h" +#include <android/dlext.h> +#include <dlfcn.h> + namespace android { namespace hardware { namespace renderscript { @@ -39,7 +42,25 @@ dispatchTable loadHAL() { static_assert(sizeof(size_t) <= sizeof(uint64_t), "RenderScript HIDL Error: sizeof(size_t) > sizeof(uint64_t)"); const char* filename = "libRS_internal.so"; - void* handle = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + // Try to load libRS_internal.so from the "rs" namespace directly. + typedef struct android_namespace_t* (*GetExportedNamespaceFnPtr)(const char*); + GetExportedNamespaceFnPtr getExportedNamespace = + (GetExportedNamespaceFnPtr)dlsym(RTLD_DEFAULT, "android_get_exported_namespace"); + void* handle = nullptr; + if (getExportedNamespace != nullptr) { + android_namespace_t* rs_namespace = getExportedNamespace("rs"); + if (rs_namespace != nullptr) { + const android_dlextinfo dlextinfo = { + .flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = rs_namespace, + }; + handle = android_dlopen_ext(filename, RTLD_LAZY | RTLD_LOCAL, &dlextinfo); + } + } + if (handle == nullptr) { + // if there is no "rs" namespace (in case when this HAL impl is loaded + // into a vendor process), then use the plain dlopen. + handle = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + } dispatchTable dispatchHal = { .SetNativeLibDir = (SetNativeLibDirFnPtr) nullptr, |