summaryrefslogtreecommitdiff
path: root/opengl
diff options
context:
space:
mode:
author Roman Lavrov <romanl@google.com> 2024-10-21 19:31:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-21 19:31:59 +0000
commit84b7155fe5026c01a54f3f77d1da3a71c400e623 (patch)
tree2c7addb0587e0550f1016528da90025c2b05f5c0 /opengl
parent4e0034d488b749f331719dca768bc5cd8e124675 (diff)
parent36ba968165a210a8dbecfb134d73a0d36cbd472c (diff)
Merge "Allow to override ANGLE suffix with debug.angle.libs.suffix" into main am: 7784c05415 am: 36ba968165
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3310155 Change-Id: Ibd35b9ce9013fa2318da2f7a68e2bc4d1cf01d28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libs/EGL/Loader.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 3be8ddca10..7012df21ae 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -548,6 +548,10 @@ static void* load_angle(const char* kind, android_namespace_t* ns) {
.flags = ANDROID_DLEXT_USE_NAMESPACE,
.library_namespace = ns,
};
+ auto prop = base::GetProperty("debug.angle.libs.suffix", "");
+ if (!prop.empty()) {
+ name = std::string("lib") + kind + "_" + prop + ".so";
+ }
so = do_android_dlopen_ext(name.c_str(), RTLD_LOCAL | RTLD_NOW, &dlextinfo);
}