Allow to override ANGLE suffix with debug.angle.libs.suffix
This allows us to avoid .so name "collision" which results in an
unexpected library being loaded when multiple ANGLE libraries are set up
Bug: b/371356548
Tested: cvd create --gpu_mode=guest_swiftshader, ANGLE from apk
Change-Id: I5a6dce90fe559f3884bc0fb956b884d8481b8c00
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);
}