Commit 9a10e062 by Greg Hartman

Update paths for the Android shared libraries

Change-Id: I41f663cc72709300ef59c1663ff0e44555afede8 Reviewed-on: https://swiftshader-review.googlesource.com/2672Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent f6df06ee
...@@ -85,6 +85,8 @@ CONSTRUCTOR static bool eglAttachProcess() ...@@ -85,6 +85,8 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"}; 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"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"}; const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
#else #else
...@@ -97,6 +99,8 @@ CONSTRUCTOR static bool eglAttachProcess() ...@@ -97,6 +99,8 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLESv2_lib[] = {"libGLESv2.dll", "libGLES_V2_translator.dll"}; 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"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"}; const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};
#else #else
......
...@@ -45,6 +45,8 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -45,6 +45,8 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"}; 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"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"}; const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};
#else #else
......
...@@ -45,6 +45,8 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -45,6 +45,8 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"}; 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"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"}; const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};
#else #else
...@@ -57,6 +59,8 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -57,6 +59,8 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"}; 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"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"}; const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment