summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2023-11-13 08:49:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-13 08:49:20 +0000
commit84e6863205d696471bcf9d96d0dd664f82b4786f (patch)
tree45b668bc5250597395323422de1543f7c06d3d5e
parentc10c372fc7ee3570030219f0985dd9e19daba492 (diff)
parent02ba47d30782cd3bad1b824651ff73772696c1f0 (diff)
Merge "Vulkan: log dlerror on error" into main am: 67d71c0552 am: 02ba47d307
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2825857 Change-Id: I473f89e6dabc0f06b2f5f32089e9ab98822c1198 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--vulkan/libvulkan/driver.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index bdba27e6a1..233fd07a53 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -183,8 +183,12 @@ int LoadDriver(android_namespace_t* library_namespace,
.library_namespace = library_namespace,
};
so = android_dlopen_ext(lib_name.c_str(), LIB_DL_FLAGS, &dlextinfo);
- ALOGE("Could not load %s from updatable gfx driver namespace: %s.",
- lib_name.c_str(), dlerror());
+ if (!so) {
+ ALOGE(
+ "Could not load %s from updatable gfx driver namespace: "
+ "%s.",
+ lib_name.c_str(), dlerror());
+ }
} else {
// load built-in driver
so = android_load_sphal_library(lib_name.c_str(), LIB_DL_FLAGS);