| commit | 84b7155fe5026c01a54f3f77d1da3a71c400e623 | [log] [tgz] |
|---|---|---|
| author | Roman Lavrov <romanl@google.com> | Mon Oct 21 19:31:59 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 21 19:31:59 2024 +0000 |
| tree | 2c7addb0587e0550f1016528da90025c2b05f5c0 | |
| parent | 4e0034d488b749f331719dca768bc5cd8e124675 [diff] | |
| parent | 36ba968165a210a8dbecfb134d73a0d36cbd472c [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>
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index 3be8ddc..7012df2 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); }