diff --git a/renderscript/1.0/default/Android.bp b/renderscript/1.0/default/Android.bp index b9969697fe..d5d6d8d3ea 100644 --- a/renderscript/1.0/default/Android.bp +++ b/renderscript/1.0/default/Android.bp @@ -12,7 +12,7 @@ cc_library_shared { ], shared_libs: [ "libdl", - "liblog", + "libbase", "libhidlbase", "libhidltransport", "libutils", diff --git a/renderscript/1.0/default/Context.cpp b/renderscript/1.0/default/Context.cpp index fbfc6522c4..f5b70c9fa8 100644 --- a/renderscript/1.0/default/Context.cpp +++ b/renderscript/1.0/default/Context.cpp @@ -1,5 +1,3 @@ -#define LOG_TAG "android.hardware.renderscript@1.0-impl" - #include "Context.h" #include "Device.h" diff --git a/renderscript/1.0/default/Device.cpp b/renderscript/1.0/default/Device.cpp index a2b950ded4..8fda3ff1e2 100644 --- a/renderscript/1.0/default/Device.cpp +++ b/renderscript/1.0/default/Device.cpp @@ -1,6 +1,7 @@ #include "Context.h" #include "Device.h" +#include #include #include @@ -54,12 +55,18 @@ dispatchTable loadHAL() { .flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = rsNamespace, }; handle = android_dlopen_ext(filename, RTLD_LAZY | RTLD_LOCAL, &dlextinfo); + if (handle == nullptr) { + LOG(WARNING) << "android_dlopen_ext(" << filename << ") failed: " << dlerror(); + } } } 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); + if (handle == nullptr) { + LOG(FATAL) << "dlopen(" << filename << ") failed: " << dlerror(); + } } dispatchTable dispatchHal = {