emulator/opengl: refactor shared library handling.

+ Add a unit test.

Change-Id: I27c993d1dc819e5bd89fc1e9ae266e11e6ef9a76

3 files changed, 11 insertions, 8 deletions

diff --git a/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp b/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp
index 3cf5dbc..7d514e8 100644
--- a/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/EGLDispatch.cpp
@@ -16,7 +16,8 @@
 #include "EGLDispatch.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "osDynLibrary.h"
+
+#include "emugl/common/shared_library.h"
 
 EGLDispatch s_egl;
 
@@ -28,7 +29,7 @@ bool init_egl_dispatch()
     const char *libName = getenv("ANDROID_EGL_LIB");
     if (!libName) libName = DEFAULT_EGL_LIB;
 
-    osUtils::dynLibrary *lib = osUtils::dynLibrary::open(libName);
+    emugl::SharedLibrary *lib = emugl::SharedLibrary::open(libName);
     if (!lib) {
         printf("Failed to open %s\n", libName);
         return NULL;
diff --git a/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp b/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp
index cda205f..8c51a4e 100644
--- a/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/GL2Dispatch.cpp
@@ -17,12 +17,13 @@
 #include "GL2Dispatch.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "osDynLibrary.h"
+
+#include "emugl/common/shared_library.h"
 
 gl2_decoder_context_t s_gl2;
 int                   s_gl2_enabled;
 
-static osUtils::dynLibrary *s_gles2_lib = NULL;
+static emugl::SharedLibrary *s_gles2_lib = NULL;
 
 #define DEFAULT_GLES_V2_LIB EMUGL_LIBNAME("GLES_V2_translator")
 
@@ -38,7 +39,7 @@ bool init_gl2_dispatch()
     //
     // Load the GLES library
     //
-    s_gles2_lib = osUtils::dynLibrary::open(libName);
+    s_gles2_lib = emugl::SharedLibrary::open(libName);
     if (!s_gles2_lib) return false;
 
     //
diff --git a/emulator/opengl/host/libs/libOpenglRender/GLDispatch.cpp b/emulator/opengl/host/libs/libOpenglRender/GLDispatch.cpp
index 089512a..c127dc3 100644
--- a/emulator/opengl/host/libs/libOpenglRender/GLDispatch.cpp
+++ b/emulator/opengl/host/libs/libOpenglRender/GLDispatch.cpp
@@ -16,11 +16,12 @@
 #include "GLDispatch.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "osDynLibrary.h"
+
+#include "emugl/common/shared_library.h"
 
 GLDispatch s_gl;
 
-static osUtils::dynLibrary *s_gles_lib = NULL;
+static emugl::SharedLibrary *s_gles_lib = NULL;
 
 //
 // This function is called only once during initialiation before
@@ -34,7 +35,7 @@ bool init_gl_dispatch()
     const char *libName = getenv("ANDROID_GLESv1_LIB");
     if (!libName) libName = DEFAULT_GLES_CM_LIB;
 
-    s_gles_lib = osUtils::dynLibrary::open(libName);
+    s_gles_lib = emugl::SharedLibrary::open(libName);
     if (!s_gles_lib) return false;
 
     s_gl.glAlphaFunc = (glAlphaFunc_t) s_gles_lib->findSymbol("glAlphaFunc");