Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2466e6f authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

With SANITIZE_TARGET, load EGL libs from the instrumented path. 

Bug: 21785137
Change-Id: Iac56419a9ca776c5704bed44d3f0a1a1edd9d172
parent dbc2d87a

opengl/libs/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ ifneq ($(MAX_EGL_CACHE_SIZE),) 
  LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)

endif



ifeq (address, $(strip $(SANITIZE_TARGET)))

  LOCAL_CFLAGS_32 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib\"

  LOCAL_CFLAGS_64 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib64\"

endif



LOCAL_REQUIRED_MODULES := $(egl.cfg_config_module)

egl.cfg_config_module :=

opengl/libs/EGL/Loader.cpp

+12 −9
Original line number Diff line number Diff line
@@ -167,6 +167,14 @@ static void* load_wrapper(const char* path) { 
    return so;

}



#ifndef EGL_WRAPPER_DIR

#if defined(__LP64__)

#define EGL_WRAPPER_DIR "/system/lib64"

#else

#define EGL_WRAPPER_DIR "/system/lib"

#endif

#endif



void* Loader::open(egl_connection_t* cnx)

{

    void* dso;
@@ -187,15 +195,10 @@ void* Loader::open(egl_connection_t* cnx) 


    LOG_ALWAYS_FATAL_IF(!hnd, "couldn't find an OpenGL ES implementation");



#if defined(__LP64__)

    cnx->libEgl   = load_wrapper("/system/lib64/libEGL.so");

    cnx->libGles2 = load_wrapper("/system/lib64/libGLESv2.so");

    cnx->libGles1 = load_wrapper("/system/lib64/libGLESv1_CM.so");

#else

    cnx->libEgl   = load_wrapper("/system/lib/libEGL.so");

    cnx->libGles2 = load_wrapper("/system/lib/libGLESv2.so");

    cnx->libGles1 = load_wrapper("/system/lib/libGLESv1_CM.so");

#endif

    cnx->libEgl   = load_wrapper(EGL_WRAPPER_DIR "/libEGL.so");

    cnx->libGles2 = load_wrapper(EGL_WRAPPER_DIR "/libGLESv2.so");

    cnx->libGles1 = load_wrapper(EGL_WRAPPER_DIR "/libGLESv1_CM.so");



    LOG_ALWAYS_FATAL_IF(!cnx->libEgl,

            "couldn't load system EGL wrapper libraries");