commit 36e22dea2258d3246107102767f3e8b562109ad1
author Greg Hartman <ghartman@google.com> Tue Mar 31 16:01:46 2015 -0700
committer Greg Hartman <ghartman@google.com> Wed Apr 01 20:09:06 2015 +0000
tree a85790d4fc53ac2bcb6fa58715245c30c6d421f1
parent b7ea984f9e483aba2c1c0f26adf5ddd604a5113e

On Android: remove fallbacks that can match system libraries

Change-Id: Ieb57c03730387f04a339c2b19a7e59beb4408d19
Reviewed-on: https://swiftshader-review.googlesource.com/2770
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>

src/OpenGL/libEGL/main.cpp

diff --git a/src/OpenGL/libEGL/main.cpp b/src/OpenGL/libEGL/main.cpp
index 58bbd9e..111d417 100644
--- a/src/OpenGL/libEGL/main.cpp
+++ b/src/OpenGL/libEGL/main.cpp
@@ -86,7 +86,7 @@
 	#if defined(_WIN32)

 	const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};

 	#elif defined(__ANDROID__)

-	const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "libGLES_CM.so.1", "libGLES_CM.so"};

+	const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"};

 	#elif defined(__LP64__)

 	const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};

 	#else

@@ -100,7 +100,7 @@
 	#if defined(_WIN32)

 	const char *libGLESv2_lib[] = {"libGLESv2.dll", "libGLES_V2_translator.dll"};

 	#elif defined(__ANDROID__)

-	const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so", "libGLESv2.so.2", "libGLESv2.so"};

+	const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so"};

 	#elif defined(__LP64__)

 	const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};

 	#else

src/OpenGL/libGLES_CM/main.cpp

diff --git a/src/OpenGL/libGLES_CM/main.cpp b/src/OpenGL/libGLES_CM/main.cpp
index 7da3f8e..0927c65 100644
--- a/src/OpenGL/libGLES_CM/main.cpp
+++ b/src/OpenGL/libGLES_CM/main.cpp
@@ -46,7 +46,7 @@
 	#if defined(_WIN32)

 	const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};

 	#elif defined(__ANDROID__)

-	const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "libEGL.so.1", "libEGL.so"};

+	const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"};

 	#elif defined(__LP64__)

 	const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};

 	#else

src/OpenGL/libGLESv2/main.cpp

diff --git a/src/OpenGL/libGLESv2/main.cpp b/src/OpenGL/libGLESv2/main.cpp
index a84a9f8..f185bee 100644
--- a/src/OpenGL/libGLESv2/main.cpp
+++ b/src/OpenGL/libGLESv2/main.cpp
@@ -46,7 +46,7 @@
 	#if defined(_WIN32)

 	const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};

 	#elif defined(__ANDROID__)

-	const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "libEGL.so.1", "libEGL.so"};

+	const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"};

 	#elif defined(__LP64__)

 	const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};

 	#else

@@ -60,7 +60,7 @@
 	#if defined(_WIN32)

 	const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};

 	#elif defined(__ANDROID__)

-	const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "libGLES_CM.so.1", "libGLES_CM.so"};

+	const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"};

 	#elif defined(__LP64__)

 	const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};

 	#else