| Revision | 46a096d351d16a9d5766dffb2a657ed141fe3a01 (tree) |
|---|---|
| Time | 2017-09-21 12:38:50 |
| Author | bohu <bohu@goog...> |
| Commiter | Chih-Wei Huang |
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
Merged-In: I08c5ac22358e464c5522deef93cd40ec3bc508c9
opengl/libs/EGL/Loader.cpp (diff)| @@ -325,17 +325,17 @@ static void* load_system_driver(const char* kind) { | ||
| 325 | 325 | switch (emulationStatus) { |
| 326 | 326 | case 0: |
| 327 | 327 | #if defined(__LP64__) |
| 328 | - result = "/system/lib64/egl/libGLES_android.so"; | |
| 328 | + result = "/vendor/lib64/egl/libGLES_android.so"; | |
| 329 | 329 | #else |
| 330 | - result = "/system/lib/egl/libGLES_android.so"; | |
| 330 | + result = "/vendor/lib/egl/libGLES_android.so"; | |
| 331 | 331 | #endif |
| 332 | 332 | return result; |
| 333 | 333 | case 1: |
| 334 | 334 | // Use host-side OpenGL through the "emulation" library |
| 335 | 335 | #if defined(__LP64__) |
| 336 | - result = std::string("/system/lib64/egl/lib") + kind + "_emulation.so"; | |
| 336 | + result = std::string("/vendor/lib64/egl/lib") + kind + "_emulation.so"; | |
| 337 | 337 | #else |
| 338 | - result = std::string("/system/lib/egl/lib") + kind + "_emulation.so"; | |
| 338 | + result = std::string("/vendor/lib/egl/lib") + kind + "_emulation.so"; | |
| 339 | 339 | #endif |
| 340 | 340 | return result; |
| 341 | 341 | default: |
Android-x86
Fork