commit 1eca243add3df506a1b9d632d0bd4bbfdac9e64a
author Greg Hartman <ghartman@google.com> Thu Apr 05 10:10:34 2018 -0700
committer Nicolas Capens <nicolascapens@google.com> Fri Apr 06 00:38:41 2018 +0000
tree dc799bf106a738f8d57dbff49a9ee49fcdc56590
parent 885a96bf3b8e00a1513fa2020dbaba4e504e6512

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/18288
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/libEGL/libEGL.hpp

diff --git a/src/OpenGL/libEGL/libEGL.hpp b/src/OpenGL/libEGL/libEGL.hpp
index 1e57824..46e319a 100644
--- a/src/OpenGL/libEGL/libEGL.hpp
+++ b/src/OpenGL/libEGL/libEGL.hpp
@@ -102,9 +102,9 @@
 				#endif
 			#elif defined(__ANDROID__)
 				#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
-					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
 			#elif defined(__linux__)
 				#if defined(__LP64__)

src/OpenGL/libGLES_CM/libGLES_CM.hpp

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.hpp b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
index cd9447e..d6740ec 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.hpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
@@ -263,9 +263,9 @@
 				#endif
 			#elif defined(__ANDROID__)
 				#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
-					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
 			#elif defined(__linux__)
 				#if defined(__LP64__)

src/OpenGL/libGLESv2/libGLESv2.hpp

diff --git a/src/OpenGL/libGLESv2/libGLESv2.hpp b/src/OpenGL/libGLESv2/libGLESv2.hpp
index 49d02c1..0897d3b 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.hpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.hpp
@@ -286,9 +286,9 @@
 				#endif
 			#elif defined(__ANDROID__)
 				#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
-					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
 			#elif defined(__linux__)
 				#if defined(__LP64__)