jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Install and load our translator libraries on startup

Browse source
This commit is contained in:
Simon Fels 2016-09-29 08:49:06 +02:00
commit d731ee77c2
5 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -2,6 +2,7 @@ project(anbox C CXX)
cmake_minimum_required(VERSION 2.8.2) cmake_minimum_required(VERSION 2.8.2)
include(CTest) include(CTest)
include(GNUInstallDirs)
if (NOT CMAKE_BUILD_TYPE) if (NOT CMAKE_BUILD_TYPE)
message(STATUS "No build type selected, default to release") message(STATUS "No build type selected, default to release")
@ -92,6 +93,9 @@ add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC")
set(ANBOX_TRANSLATOR_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/anbox/translators)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTRANSLATOR_INSTALL_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${ANBOX_TRANSLATOR_INSTALL_DIR}\\\"")
add_subdirectory(external) add_subdirectory(external)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(tests) add_subdirectory(tests)

4
external/android-emugl/host/libs/Translator/EGL/CMakeLists.txt vendored
View file

@ -24,3 +24,7 @@ target_link_libraries(EGL_translator
${EGL_LIBRARIES} ${EGL_LIBRARIES}
${GLESv2_LDFLAGS} ${GLESv2_LDFLAGS}
${GLESv2_LIBRARIES}) ${GLESv2_LIBRARIES})
install(
TARGETS EGL_translator
LIBRARY DESTINATION ${ANBOX_TRANSLATOR_INSTALL_DIR})

4
external/android-emugl/host/libs/Translator/GLES_CM/CMakeLists.txt vendored
View file

@ -6,3 +6,7 @@ set(SOURCES
add_library(GLES_CM_translator SHARED ${SOURCES}) add_library(GLES_CM_translator SHARED ${SOURCES})
target_link_libraries(GLES_CM_translator GLcommon) target_link_libraries(GLES_CM_translator GLcommon)
install(
TARGETS GLES_CM_translator
LIBRARY DESTINATION ${ANBOX_TRANSLATOR_INSTALL_DIR})

4
external/android-emugl/host/libs/Translator/GLES_V2/CMakeLists.txt vendored
View file

@ -7,3 +7,7 @@ set(SOURCES
add_library(GLES_V2_translator SHARED ${SOURCES}) add_library(GLES_V2_translator SHARED ${SOURCES})
target_link_libraries(GLES_V2_translator GLcommon) target_link_libraries(GLES_V2_translator GLcommon)
install(
TARGETS GLES_V2_translator
LIBRARY DESTINATION ${ANBOX_TRANSLATOR_INSTALL_DIR})

6
src/anbox/graphics/gl_renderer_server.cpp
View file

@ -30,10 +30,16 @@ namespace graphics {
GLRendererServer::GLRendererServer(const std::shared_ptr<WindowCreator> &window_creator) : GLRendererServer::GLRendererServer(const std::shared_ptr<WindowCreator> &window_creator) :
window_creator_(window_creator) { window_creator_(window_creator) {
#if 0
// Force the host EGL/GLES libraries as translator implementation // Force the host EGL/GLES libraries as translator implementation
::setenv("ANDROID_EGL_LIB", "libEGL.so.1", 0); ::setenv("ANDROID_EGL_LIB", "libEGL.so.1", 0);
::setenv("ANDROID_GLESv1_LIB", "libGLESv2.so.2", 0); ::setenv("ANDROID_GLESv1_LIB", "libGLESv2.so.2", 0);
::setenv("ANDROID_GLESv2_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);
#endif
if (!initLibrary()) if (!initLibrary())
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to initialize OpenGL renderer")); BOOST_THROW_EXCEPTION(std::runtime_error("Failed to initialize OpenGL renderer"));