commit bd97d15891a956daeb251ddc8e6110487cf13e69
author Bo Hu <bohu@google.com> Fri Sep 01 00:23:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 01 00:23:27 2017 +0000
tree 87ec084f271fbc14f3e09ab20a057351c58356a3
parent 149e4b61d605e563f4e3212d1d0f9acb8a1a1ac3
parent a01809939e5c4be35a1b02a2331c9a712bc1d2c0

Merge "emulator: update EGL emulation library path" am: 7e7457f225
am: a01809939e

Change-Id: Iee2bbd6964ee927c70b7649628b37035d4a95073

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 9095479..399affc 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -327,17 +327,17 @@
             switch (emulationStatus) {
                 case 0:
 #if defined(__LP64__)
-                    result = "/system/lib64/egl/libGLES_android.so";
+                    result = "/vendor/lib64/egl/libGLES_android.so";
 #else
-                    result = "/system/lib/egl/libGLES_android.so";
+                    result = "/vendor/lib/egl/libGLES_android.so";
 #endif
                     return result;
                 case 1:
                     // Use host-side OpenGL through the "emulation" library
 #if defined(__LP64__)
-                    result = std::string("/system/lib64/egl/lib") + kind + "_emulation.so";
+                    result = std::string("/vendor/lib64/egl/lib") + kind + "_emulation.so";
 #else
-                    result = std::string("/system/lib/egl/lib") + kind + "_emulation.so";
+                    result = std::string("/vendor/lib/egl/lib") + kind + "_emulation.so";
 #endif
                     return result;
                 default: