| commit | 36ba968165a210a8dbecfb134d73a0d36cbd472c | [log] [tgz] |
|---|---|---|
| author | Roman Lavrov <romanl@google.com> | Mon Oct 21 19:16:25 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 21 19:16:25 2024 +0000 |
| tree | 2d115568e0078f74706bc78cedd8d223a2e2ef35 | |
| parent | 66f991c467243eae07122dfd96f5ea339a080e98 [diff] | |
| parent | 7784c0541585cc9f86c20288831e65e96d298cfc [diff] |
Merge "Allow to override ANGLE suffix with debug.angle.libs.suffix" into main am: 7784c05415 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3310155 Change-Id: I30e57854737c1aee8135b63f07bd4eb5d1d181a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index bf0e38e..fed6afc 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp
@@ -548,6 +548,10 @@ .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); }