commit e6161630a14fb1c54471f9bf340430f993fcdca3
author Colin Cross <ccross@android.com> Mon Dec 04 18:53:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 04 18:53:38 2017 +0000
tree 67c130d50f2593522883bd159c53bb2b77e68fef
parent 2463d6b8bc6ba57787919ede781906c1a489d13f
parent dd2dae9cde2aaaa72c450ceb9f476f735170eb3f

Merge "Export AIDL files as a filegroup for framework.jar"

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 399affc..9822849 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -340,6 +340,14 @@
                     result = std::string("/vendor/lib/egl/lib") + kind + "_emulation.so";
 #endif
                     return result;
+                case 2:
+                    // Use guest side swiftshader library
+#if defined(__LP64__)
+                    result = std::string("/vendor/lib64/egl/lib") + kind + "_swiftshader.so";
+#else
+                    result = std::string("/vendor/lib/egl/lib") + kind + "_swiftshader.so";
+#endif
+                    return result;
                 default:
                     // Not in emulator, or use other guest-side implementation
                     break;