[Mesa-stable] [PATCH] targets/dri: android: use WHOLE static libraries

[Emil Velikov]

This is bring behaviour similar to whole-archive, where hunks of the
static libraries are not discarded and thus the exact order of the
libraries does not matter.

It has been used in i915/i965 for a very long time, we might want to
spare us some headaches and use it as well.

This fixes issues with the resent pipe-loader introduction.

Cc: mesa-stable at lists.freedesktop.org
Reported-by: Mauro Rossi <issor.oruam at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/targets/dri/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 2d9610e..7a4a6f3 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -100,7 +100,7 @@ ifneq ($(filter nouveau r600g,$(MESA_GPU_DRIVERS)),)
 LOCAL_SHARED_LIBRARIES += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),libc++,libstlport)
 endif
 
-LOCAL_STATIC_LIBRARIES := \
+LOCAL_WHOLE_STATIC_LIBRARIES := \
 	$(gallium_DRIVERS) \
 	libmesa_st_dri \
 	libmesa_st_mesa \
@@ -113,7 +113,7 @@ LOCAL_STATIC_LIBRARIES := \
 	libmesa_loader \
 
 ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_STATIC_LIBRARIES += \
+LOCAL_WHOLE_STATIC_LIBRARIES += \
 	libLLVMR600CodeGen \
 	libLLVMR600Desc \
 	libLLVMR600Info \
-- 
2.6.2