Update paths for the Android shared libraries

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

diff --git a/src/OpenGL/libEGL/main.cpp b/src/OpenGL/libEGL/main.cpp
index 3cd35d7..58bbd9e 100644 (file)
--- a/src/OpenGL/libEGL/main.cpp
+++ b/src/OpenGL/libEGL/main.cpp
@@ -85,6 +85,8 @@ CONSTRUCTOR static bool eglAttachProcess()
 \r
        #if defined(_WIN32)\r
        const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};\r
+       #elif defined(__ANDROID__)\r
+       const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "libGLES_CM.so.1", "libGLES_CM.so"};\r
        #elif defined(__LP64__)\r
        const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};\r
        #else\r
@@ -97,6 +99,8 @@ CONSTRUCTOR static bool eglAttachProcess()
 \r
        #if defined(_WIN32)\r
        const char *libGLESv2_lib[] = {"libGLESv2.dll", "libGLES_V2_translator.dll"};\r
+       #elif defined(__ANDROID__)\r
+       const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so", "libGLESv2.so.2", "libGLESv2.so"};\r
        #elif defined(__LP64__)\r
        const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};\r
        #else\r

diff --git a/src/OpenGL/libGLES_CM/main.cpp b/src/OpenGL/libGLES_CM/main.cpp
index bef7451..7da3f8e 100644 (file)
--- a/src/OpenGL/libGLES_CM/main.cpp
+++ b/src/OpenGL/libGLES_CM/main.cpp
@@ -45,6 +45,8 @@ CONSTRUCTOR static bool glAttachProcess()
 \r
        #if defined(_WIN32)\r
        const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};\r
+       #elif defined(__ANDROID__)\r
+       const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "libEGL.so.1", "libEGL.so"};\r
        #elif defined(__LP64__)\r
        const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};\r
        #else\r

diff --git a/src/OpenGL/libGLESv2/main.cpp b/src/OpenGL/libGLESv2/main.cpp
index 9ab0ed9..a84a9f8 100644 (file)
--- a/src/OpenGL/libGLESv2/main.cpp
+++ b/src/OpenGL/libGLESv2/main.cpp
@@ -45,6 +45,8 @@ CONSTRUCTOR static bool glAttachProcess()
 \r
        #if defined(_WIN32)\r
        const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};\r
+       #elif defined(__ANDROID__)\r
+       const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "libEGL.so.1", "libEGL.so"};\r
        #elif defined(__LP64__)\r
        const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};\r
        #else\r
@@ -57,6 +59,8 @@ CONSTRUCTOR static bool glAttachProcess()
 \r
        #if defined(_WIN32)\r
        const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};\r
+       #elif defined(__ANDROID__)\r
+       const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "libGLES_CM.so.1", "libGLES_CM.so"};\r
        #elif defined(__LP64__)\r
        const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};\r
        #else\r