Module: Mesa Branch: master Commit: a49ebfab1d093475610e8504cf3400c054e300c0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a49ebfab1d093475610e8504cf3400c054e300c0
Author: Adrian Negreanu <[email protected]> Date: Fri Jun 6 12:16:07 2014 +0300 android: add libloader to libGLES_mesa and libmesa_egl_dri2 This fixes src/egl/drivers/dri2/platform_android.c:664: error: undefined reference to 'loader_set_logger' src/egl/drivers/dri2/platform_android.c:678: error: undefined reference to 'loader_get_driver_for_fd' Cc: "10.1 10.2" <[email protected]> Signed-off-by: Adrian Negreanu <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Juha-Pekka Heikkila <[email protected]> --- src/egl/drivers/dri2/Android.mk | 3 +++ src/egl/main/Android.mk | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk index e46c8a9..2ff62fc 100644 --- a/src/egl/drivers/dri2/Android.mk +++ b/src/egl/drivers/dri2/Android.mk @@ -42,6 +42,9 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/loader \ $(DRM_GRALLOC_TOP) +LOCAL_STATIC_LIBRARIES := \ + libloader + LOCAL_MODULE := libmesa_egl_dri2 include $(MESA_COMMON_MK) diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index 61465da..580289f 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -154,11 +154,14 @@ LOCAL_STATIC_LIBRARIES := \ libmesa_glsl \ libmesa_glsl_utils \ libmesa_gallium \ - libloader \ $(LOCAL_STATIC_LIBRARIES) endif # MESA_BUILD_GALLIUM +LOCAL_STATIC_LIBRARIES := \ + $(LOCAL_STATIC_LIBRARIES) \ + libloader + LOCAL_MODULE := libGLES_mesa LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
