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" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>

diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk
index e46c8a9e15548b56ce1b4d11a2da8c28f1f6cc28..2ff62fc3a4f99ddaff1987c95f8fac2635cc33a1 100644 (file)
--- 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 61465da05f54b57483cbd7c717f18972962c506e..580289f8aad33d31a1277da848bf6460cbc53f7b 100644 (file)
--- 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