Only load a dependent library when it has an expected symbol.

src/Common/SharedLibrary.hpp

@@ -19,10 +19,12 @@
 #endif
 
 void *getLibraryHandle(const char *path);
-void *loadLibrary(const char *path);
+void *loadLibrary(const char *path);
+void freeLibrary(void *library);
+void *getProcAddress(void *library, const char *name);
 
 template<int n>
-void *loadLibrary(const char *(&names)[n])
+void *loadLibrary(const char *(&names)[n], const char *mustContainSymbol = nullptr)
 {
 	for(int i = 0; i < n; i++)
 	{
@@ -30,7 +32,12 @@ void *loadLibrary(const char *(&names)[n])
 
 		if(library)
 		{
-			return library;
+			if(!mustContainSymbol || getProcAddress(library, mustContainSymbol))
+			{
+				return library;
+			}
+
+			freeLibrary(library);
 		}
 	}
 
@@ -40,7 +47,12 @@ void *loadLibrary(const char *(&names)[n])
 
 		if(library)
 		{
-			return library;
+			if(!mustContainSymbol || getProcAddress(library, mustContainSymbol))
+			{
+				return library;
+			}
+
+			freeLibrary(library);
 		}
 	}
 

src/OpenGL/libEGL/Android.mk

@@ -24,6 +24,7 @@ LOCAL_CFLAGS += -UNDEBUG -g
 #LOCAL_CFLAGS += -DANGLE_DISABLE_TRACE
 
 LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -fvisibility=protected
 
 # These changes tie the build to Cloud Android. Do something else
 # for other Android builds.

src/OpenGL/libEGL/exports.map

@@ -42,7 +42,7 @@ global:
     eglCreatePlatformWindowSurfaceEXT;
     eglCreatePlatformPixmapSurfaceEXT;
 
-	libEGLexports;
+	libEGL_swiftshader;
 
 local:
     *;

src/OpenGL/libEGL/libEGL.cbp

@@ -100,6 +100,7 @@
 			<Add option="-Wall" />
 			<Add option="-std=c++11" />
 			<Add option="-fexceptions" />
+			<Add option="-fvisibility=protected" />
 			<Add directory="./../include/" />
 			<Add directory="./../" />
 			<Add directory="./../../" />

src/OpenGL/libEGL/libEGL.def

@@ -42,4 +42,4 @@ EXPORTS
     eglCreatePlatformWindowSurfaceEXT
     eglCreatePlatformPixmapSurfaceEXT
 
-	libEGLexports
\ No newline at end of file
+	libEGL_swiftshader
\ No newline at end of file

src/OpenGL/libEGL/libEGL.hpp

@@ -89,12 +89,12 @@ private:
 			const char *libEGL_lib[] = {"libEGL_translator.so", "libEGL.so.1", "libEGL.so"};
 			#endif
 
-			libEGL = loadLibrary(libEGL_lib);
+			libEGL = loadLibrary(libEGL_lib, "libEGL_swiftshader");
 
 			if(libEGL)
 			{
-				auto libEGLexportsProc = (LibEGLexports *(*)())getProcAddress(libEGL, "libEGLexports");
-				libEGLexports = libEGLexportsProc();
+				auto libEGL_swiftshader = (LibEGLexports *(*)())getProcAddress(libEGL, "libEGL_swiftshader");
+				libEGLexports = libEGL_swiftshader();
 			}
 		}
 

src/OpenGL/libEGL/main.cpp

@@ -363,7 +363,7 @@ LibEGLexports::LibEGLexports()
 	this->clientGetCurrentDisplay = egl::getCurrentDisplay;
 }
 
-extern "C" LibEGLexports *libEGLexports()
+extern "C" LibEGLexports *libEGL_swiftshader()
 {
 	static LibEGLexports libEGL;
 	return &libEGL;

src/OpenGL/libGLES_CM/Android.mk

@@ -89,6 +89,7 @@ LOCAL_SRC_FILES += \
 LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_CM_swiftshader\"
 LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -fvisibility=protected
 
 # Android's make system also uses NDEBUG, so we need to set/unset it forcefully
 # Uncomment for ON:

src/OpenGL/libGLES_CM/exports.map

 {
 global:
+	eglBindAPI;
 	eglBindTexImage;
     eglChooseConfig;
     eglCopyBuffers;
@@ -205,7 +206,7 @@ global:
     glDrawTexfOES;
     glDrawTexfvOES;
 
-    libGLES_CMexports;
+    libGLES_CM_swiftshader;
 
 	Register;
 

src/OpenGL/libGLES_CM/libGLES_CM.cbp

@@ -115,6 +115,7 @@
 			<Add option="-fexceptions" />
 			<Add option="-fno-operator-names" />
 			<Add option="-msse2" />
+			<Add option="-fvisibility=protected" />
 			<Add option="-D__STDC_LIMIT_MACROS" />
 			<Add option="-D__STDC_CONSTANT_MACROS" />
 			<Add directory="./../" />

src/OpenGL/libGLES_CM/libGLES_CM.def

@@ -205,6 +205,6 @@ EXPORTS
     glDrawTexfOES
     glDrawTexfvOES
 
-	libGLES_CMexports
+	libGLES_CM_swiftshader
 
 	Register
\ No newline at end of file

src/OpenGL/libGLES_CM/libGLES_CM.hpp

@@ -76,12 +76,12 @@ private:
 			const char *libGLES_CM_lib[] = {"libGLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
 			#endif
 
-			libGLES_CM = loadLibrary(libGLES_CM_lib);
+			libGLES_CM = loadLibrary(libGLES_CM_lib, "libGLES_CM_swiftshader");
 
 			if(libGLES_CM)
 			{
-				auto libGLES_CMexportsProc = (LibGLES_CMexports *(*)())getProcAddress(libGLES_CM, "libGLES_CMexports");
-				libGLES_CMexports = libGLES_CMexportsProc();
+				auto libGLES_CM_swiftshader = (LibGLES_CMexports *(*)())getProcAddress(libGLES_CM, "libGLES_CM_swiftshader");
+				libGLES_CMexports = libGLES_CM_swiftshader();
 			}
 		}
 

src/OpenGL/libGLES_CM/main.cpp

@@ -157,7 +157,7 @@ LibGLES_CMexports::LibGLES_CMexports()
 	this->glEGLImageTargetTexture2DOES = ::glEGLImageTargetTexture2DOES;
 }
 
-extern "C" LibGLES_CMexports *libGLES_CMexports()
+extern "C" LibGLES_CMexports *libGLES_CM_swiftshader()
 {
 	static LibGLES_CMexports libGLES_CM;
 	return &libGLES_CM;

src/OpenGL/libGLESv2/Android.mk

@@ -135,6 +135,7 @@ LOCAL_CFLAGS += -UNDEBUG -g
 
 LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 LOCAL_CFLAGS += -std=c++11
+LOCAL_CFLAGS += -fvisibility=protected
 
 LOCAL_SHARED_LIBRARIES += libdl liblog libcutils libhardware libui libutils \
     $(GCE_STLPORT_LIBS)

src/OpenGL/libGLESv2/exports.map

@@ -168,7 +168,7 @@ global:
 	glEGLImageTargetTexture2DOES;
 	glEGLImageTargetRenderbufferStorageOES;
 
-    libGLESv2exports;
+    libGLESv2_swiftshader;
 
 	Register;
 

src/OpenGL/libGLESv2/libGLESv2.cbp

@@ -115,6 +115,7 @@
 			<Add option="-fexceptions" />
 			<Add option="-fno-operator-names" />
 			<Add option="-msse2" />
+			<Add option="-fvisibility=protected" />
 			<Add option="-D__STDC_LIMIT_MACROS" />
 			<Add option="-D__STDC_CONSTANT_MACROS" />
 			<Add directory="./../" />

src/OpenGL/libGLESv2/libGLESv2.def

@@ -274,6 +274,6 @@ EXPORTS
     glTexStorage3D                  @304
     glGetInternalformativ           @308
 
-    libGLESv2exports
+    libGLESv2_swiftshader
 
 	Register
\ No newline at end of file

src/OpenGL/libGLESv2/libGLESv2.hpp

@@ -74,12 +74,12 @@ private:
 			const char *libGLESv2_lib[] = {"libGLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};
 			#endif
 
-			libGLESv2 = loadLibrary(libGLESv2_lib);
+			libGLESv2 = loadLibrary(libGLESv2_lib, "libGLESv2_swiftshader");
 
 			if(libGLESv2)
 			{
-				auto libGLESv2exportsProc = (LibGLESv2exports *(*)())getProcAddress(libGLESv2, "libGLESv2exports");
-				libGLESv2exports = libGLESv2exportsProc();
+				auto libGLESv2_swiftshader = (LibGLESv2exports *(*)())getProcAddress(libGLESv2, "libGLESv2_swiftshader");
+				libGLESv2exports = libGLESv2_swiftshader();
 			}
 		}
 

src/OpenGL/libGLESv2/main.cpp

@@ -165,7 +165,7 @@ LibGLESv2exports::LibGLESv2exports()
 	this->createFrameBuffer = ::createFrameBuffer;
 }
 
-extern "C" LibGLESv2exports *libGLESv2exports()
+extern "C" LibGLESv2exports *libGLESv2_swiftshader()
 {
 	static LibGLESv2exports libGLESv2;
 	return &libGLESv2;