[Mesa-dev] [PATCH 3/8] android: add libloader to libGLES_mesa and libmesa_egl_dri2

[Adrian Negreanu]

From: Adrian Negreanu <adrian.m.negreanu at intel.com>

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'

Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
---
 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
 
-- 
2.0.0.rc4