diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-20 20:33:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-20 20:33:18 +0000 |
commit | eafadb3b873bc639017459e67b24debada9d9961 (patch) | |
tree | 382b69a4beda2fdd396024711b96250b86ebf4d6 /opengl | |
parent | bf8e3666a80365cab461745691f90aaa4a659d5d (diff) | |
parent | 277f6f95fa85f169e2d89af0854744e7af9484a1 (diff) | |
download | native-eafadb3b873bc639017459e67b24debada9d9961.tar.gz |
Merge "[Cherry-pick] Make sure the correct ANGLE binary is used." into main
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/libs/EGL/egl_angle_platform.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/opengl/libs/EGL/egl_angle_platform.cpp b/opengl/libs/EGL/egl_angle_platform.cpp index 9a6bb7a61c..ee605c2011 100644 --- a/opengl/libs/EGL/egl_angle_platform.cpp +++ b/opengl/libs/EGL/egl_angle_platform.cpp @@ -35,6 +35,7 @@ namespace angle { +constexpr char kAngleEs2Lib[] = "libGLESv2_angle.so"; constexpr int kAngleDlFlags = RTLD_LOCAL | RTLD_NOW; static GetDisplayPlatformFunc angleGetDisplayPlatform = nullptr; @@ -115,8 +116,6 @@ bool initializeAnglePlatform(EGLDisplay dpy) { android_namespace_t* ns = android::GraphicsEnv::getInstance().getAngleNamespace(); void* so = nullptr; if (ns) { - // Loading from an APK, so hard-code the suffix to "_angle". - constexpr char kAngleEs2Lib[] = "libGLESv2_angle.so"; const android_dlextinfo dlextinfo = { .flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = ns, @@ -130,19 +129,11 @@ bool initializeAnglePlatform(EGLDisplay dpy) { } } else { // If we are here, ANGLE is loaded as built-in gl driver in the sphal. - // Get the specified ANGLE library filename suffix. - std::string angleEs2LibSuffix = android::base::GetProperty("ro.hardware.egl", ""); - if (angleEs2LibSuffix.empty()) { - ALOGE("%s failed to get valid ANGLE library filename suffix!", __FUNCTION__); - return false; - } - - std::string angleEs2LibName = "libGLESv2_" + angleEs2LibSuffix + ".so"; - so = android_load_sphal_library(angleEs2LibName.c_str(), kAngleDlFlags); + so = android_load_sphal_library(kAngleEs2Lib, kAngleDlFlags); if (so) { - ALOGD("dlopen (%s) success at %p", angleEs2LibName.c_str(), so); + ALOGD("dlopen (%s) success at %p", kAngleEs2Lib, so); } else { - ALOGE("%s failed to dlopen %s!", __FUNCTION__, angleEs2LibName.c_str()); + ALOGE("%s failed to dlopen %s: %s!", __FUNCTION__, kAngleEs2Lib, dlerror()); return false; } } |