From 42f338ba8a52062500fafebab499e7fccdeb6391 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Fri, 21 Oct 2016 19:41:22 +0200 Subject: [PATCH] Use translator libraries from snap if available --- src/anbox/graphics/gl_renderer_server.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/anbox/graphics/gl_renderer_server.cpp b/src/anbox/graphics/gl_renderer_server.cpp index b14857c..50624f0 100644 --- a/src/anbox/graphics/gl_renderer_server.cpp +++ b/src/anbox/graphics/gl_renderer_server.cpp @@ -36,9 +36,10 @@ GLRendererServer::GLRendererServer(const std::shared_ptr &window_ ::setenv("ANDROID_GLESv1_LIB", "libGLESv2.so.2", 0); ::setenv("ANDROID_GLESv2_LIB", "libGLESv2.so.2", 0); } else { - ::setenv("ANDROID_EGL_LIB", utils::string_format("%s/libEGL_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); - ::setenv("ANDROID_GLESv1_LIB", utils::string_format("%s/libGLES_CM_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); - ::setenv("ANDROID_GLESv2_LIB", utils::string_format("%s/libGLES_V2_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); + auto translator_dir = utils::prefix_dir_from_env(TRANSLATOR_INSTALL_DIR, "SNAP"); + ::setenv("ANDROID_EGL_LIB", utils::string_format("%s/libEGL_translator.so", translator_dir).c_str(), 0); + ::setenv("ANDROID_GLESv1_LIB", utils::string_format("%s/libGLES_CM_translator.so", translator_dir).c_str(), 0); + ::setenv("ANDROID_GLESv2_LIB", utils::string_format("%s/libGLES_V2_translator.so", translator_dir).c_str(), 0); } if (!initLibrary())