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

Commit acdebe35 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix/clean these Android.mk following dbort and joeo's comments

parent e92c713c

opengl/libagl/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -32,12 +32,13 @@ endif 


ifneq ($(TARGET_SIMULATOR),true)

    # we need to access the private Bionic header <bionic_tls.h>

    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

    LOCAL_C_INCLUDES += bionic/libc/private

endif



ifeq ($(LIBAGL_USE_GRALLOC_COPYBITS),1)

    LOCAL_CFLAGS += -DLIBAGL_USE_GRALLOC_COPYBITS -I$(LOCAL_PATH)/../../../../hardware/libhardware/modules/gralloc

    LOCAL_CFLAGS += -DLIBAGL_USE_GRALLOC_COPYBITS

    LOCAL_SRC_FILES += copybit.cpp

    LOCAL_C_INCLUDES += hardware/libhardware/modules/gralloc

endif



LOCAL_CFLAGS += -DLOG_TAG=\"libagl\"

opengl/libs/Android.mk

+6 −6
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ LOCAL_MODULE:= libEGL 
ifeq ($(TARGET_SIMULATOR),true)

else

    LOCAL_SHARED_LIBRARIES += libdl

    # we need to access the Bionic private header <bionic_tls.h>

    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

    # we need to access the private Bionic header <bionic_tls.h>

    LOCAL_C_INCLUDES += bionic/libc/private

endif



LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\"
@@ -66,8 +66,8 @@ LOCAL_MODULE:= libGLESv1_CM 
ifeq ($(TARGET_SIMULATOR),true)

else

    LOCAL_SHARED_LIBRARIES += libdl

    # we need to access the Bionic private header <bionic_tls.h>

    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

    # we need to access the private Bionic header <bionic_tls.h>

    LOCAL_C_INCLUDES += bionic/libc/private

endif



LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\"
@@ -95,8 +95,8 @@ LOCAL_MODULE:= libGLESv2 
ifeq ($(TARGET_SIMULATOR),true)

else

    LOCAL_SHARED_LIBRARIES += libdl

    # we need to access the Bionic private header <bionic_tls.h>

    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

    # we need to access the private Bionic header <bionic_tls.h>

    LOCAL_C_INCLUDES += bionic/libc/private

endif



LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\"

opengl/libs/EGL/Loader.cpp

+2 −4
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void* Loader::open(EGLNativeDisplayType display, int impl, gl_hooks_t* hooks) 
    }



    LOG_FATAL_IF(!index && !impl && !hnd, 

            "couldn't't find the default OpenGL ES implementation "

            "couldn't find the default OpenGL ES implementation "

            "for default display");

    

    return (void*)hnd;
@@ -226,9 +226,7 @@ void *Loader::load_driver(const char* driver, gl_hooks_t* hooks, uint32_t mask) 
{

    //LOGD("%s", driver);

    void* dso = dlopen(driver, RTLD_NOW | RTLD_LOCAL);

    LOGE_IF(!dso,

            "couldn't load <%s> library (%s)",

            driver, dlerror());

    LOGE_IF(!dso, "%s", dlerror());

    if (dso == 0)

        return 0;