Linux: Load Ozone EGL binaries from DIR_ASSETS (fixes issue #3213)

This commit is contained in:
Marshall Greenblatt 2021-11-08 14:29:31 -05:00
parent ad0b71aa5f
commit 23f5569e69
1 changed files with 22 additions and 0 deletions

View File

@ -46,3 +46,25 @@ index 016046d6caa4f..116e4919cda08 100644
return false;
const char kGLESv2ANGLELibraryName[] = "libGLESv2.so";
diff --git ui/ozone/common/egl_util.cc ui/ozone/common/egl_util.cc
index e028d8cf8dec6..d172832589534 100644
--- ui/ozone/common/egl_util.cc
+++ ui/ozone/common/egl_util.cc
@@ -158,7 +158,7 @@ bool LoadDefaultEGLGLES2Bindings(
#if BUILDFLAG(ENABLE_SWIFTSHADER)
base::FilePath module_path;
#if !defined(OS_FUCHSIA)
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
return false;
module_path = module_path.Append(FILE_PATH_LITERAL("swiftshader/"));
#endif
@@ -171,7 +171,7 @@ bool LoadDefaultEGLGLES2Bindings(
} else if (implementation.gl == gl::kGLImplementationEGLANGLE) {
base::FilePath module_path;
#if !defined(OS_FUCHSIA)
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
return false;
#endif