Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS

frameworks-native: コミット

frameworks/native


コミットメタ情報

リビジョン46a096d351d16a9d5766dffb2a657ed141fe3a01 (tree)
日時2017-09-21 12:38:50
作者bohu <bohu@goog...>
コミッター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

変更サマリ

差分

--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -325,17 +325,17 @@ static void* load_system_driver(const char* kind) {
325325 switch (emulationStatus) {
326326 case 0:
327327 #if defined(__LP64__)
328- result = "/system/lib64/egl/libGLES_android.so";
328+ result = "/vendor/lib64/egl/libGLES_android.so";
329329 #else
330- result = "/system/lib/egl/libGLES_android.so";
330+ result = "/vendor/lib/egl/libGLES_android.so";
331331 #endif
332332 return result;
333333 case 1:
334334 // Use host-side OpenGL through the "emulation" library
335335 #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";
337337 #else
338- result = std::string("/system/lib/egl/lib") + kind + "_emulation.so";
338+ result = std::string("/vendor/lib/egl/lib") + kind + "_emulation.so";
339339 #endif
340340 return result;
341341 default:
旧リポジトリブラウザで表示