From a49ebfab1d093475610e8504cf3400c054e300c0 Mon Sep 17 00:00:00 2001 From: Adrian Negreanu Date: Fri, 6 Jun 2014 12:16:07 +0300 Subject: [PATCH] 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" Signed-off-by: Adrian Negreanu Reviewed-by: Emil Velikov Reviewed-by: Juha-Pekka Heikkila --- 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 e46c8a9e155..2ff62fc3a4f 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 61465da05f5..580289f8aad 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 -- 2.30.2