From 85893499ce0a950ec46827d9c2062a536ec252bc Mon Sep 17 00:00:00 2001 From: bohu Date: Sun, 2 Jul 2017 22:08:13 -0700 Subject: emulator: update EGL emulation library path Change it from system/ to vendor/, due to treble requirement. Test: build sdk_phone_x86-eng, boot emulator and surfaceflinger should not complain missing emulation library and emulator should boot to homescreen. Change-Id: I08c5ac22358e464c5522deef93cd40ec3bc508c9 --- opengl/libs/EGL/Loader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'opengl') diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index 32f8caa989..371239ddc0 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -327,17 +327,17 @@ static void* load_system_driver(const char* kind) { 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: -- cgit v1.2.3