Skip to content

S
swiftshader
Commit 1eca243a by Greg Hartman Committed by Nicolas Capens
Options

Also look for sibling libraries in /system

This cleans up a problem that was introduced by https://swiftshader-review.googlesource.com/17188 LOCAL_VENDOR_MODULE was first supported on O, so when we build SwiftShader on earlier branches the libraries land in /system. The fix in the Android.mk files would be complicated and would revert some of the cleanup, and would cause issues for 64 bit only builds. While it would be possible to extend the original approach, it just seems cleaner to check in /system at runtime. Bug b/76437145 Test: Local build and boot of Cloud Android N Change-Id: I86e0363a8cbd7b8f2ba744f14a67dfe457f3725f Reviewed-on: https://swiftshader-review.googlesource.com/18288Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 885a96bf
Showing with 6 additions and 6 deletions
src/OpenGL/libEGL/libEGL.hpp
...@@ -102,9 +102,9 @@ private: ...@@ -102,9 +102,9 @@ private:
#endif #endif
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
#if defined(__LP64__) #if defined(__LP64__)
const char *libEGL_lib[] = {"/vendor/lib64/egl/libEGL_swiftshader.so"}; const char *libEGL_lib[] = {"/vendor/lib64/egl/libEGL_swiftshader.so", "/system/lib64/egl/libEGL_swiftshader.so"};
#else #else
const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"}; const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "/system/lib/egl/libEGL_swiftshader.so"};
#endif #endif
#elif defined(__linux__) #elif defined(__linux__)
#if defined(__LP64__) #if defined(__LP64__)
......
src/OpenGL/libGLES_CM/libGLES_CM.hpp
...@@ -263,9 +263,9 @@ private: ...@@ -263,9 +263,9 @@ private:
#endif #endif
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
#if defined(__LP64__) #if defined(__LP64__)
const char *libGLES_CM_lib[] = {"/vendor/lib64/egl/libGLESv1_CM_swiftshader.so"}; const char *libGLES_CM_lib[] = {"/vendor/lib64/egl/libGLESv1_CM_swiftshader.so", "/system/lib64/egl/libGLESv1_CM_swiftshader.so"};
#else #else
const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"}; const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "/system/lib/egl/libGLESv1_CM_swiftshader.so"};
#endif #endif
#elif defined(__linux__) #elif defined(__linux__)
#if defined(__LP64__) #if defined(__LP64__)
......
src/OpenGL/libGLESv2/libGLESv2.hpp
...@@ -286,9 +286,9 @@ private: ...@@ -286,9 +286,9 @@ private:
#endif #endif
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
#if defined(__LP64__) #if defined(__LP64__)
const char *libGLESv2_lib[] = {"/vendor/lib64/egl/libGLESv2_swiftshader.so"}; const char *libGLESv2_lib[] = {"/vendor/lib64/egl/libGLESv2_swiftshader.so", "/system/lib64/egl/libGLESv2_swiftshader.so"};
#else #else
const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so"}; const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so", "/system/lib/egl/libGLESv2_swiftshader.so"};
#endif #endif
#elif defined(__linux__) #elif defined(__linux__)
#if defined(__LP64__) #if defined(__LP64__)
......
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