summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2023-11-13 08:18:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-13 08:18:26 +0000
commite93fc2e97e9e7ca17adba769a65ca92749885a0c (patch)
tree1f32ac46a16881af03c74d53e0af86867e4f4d29
parent2ccc7c7dc51ad6b8e872814a62bbeb468558f363 (diff)
parent67d71c05524f7df2b2faf0ce4fee26d35749ecac (diff)
Merge "Vulkan: log dlerror on error" into main am: 67d71c0552
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2825857 Change-Id: I555a307e8afb5c4621bee467e867be96a782a2ba 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 aea897c84c..0b5bb1504c 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);