commit 07f583186dd4c5a92f6382c4c232a6a96bd049a6
author Emil Velikov <emil.l.velikov@gmail.com> Mon Jul 28 20:24:02 2014 +0100
committer Emil Velikov <emil.l.velikov@gmail.com> Wed Aug 13 00:46:55 2014 +0100
tree a35aa7abba09c84bdc76b52f9d556b0889922055
parent dfa6dc5eb8e76953bfc45a966813f736b0aa2346

android: glsl: the stlport over the limited Android STL

The latter lacks various functionality used by mesa/glsl.

Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

src/glsl/Android.mk

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 8a39426..7b1fa7e 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -39,12 +39,12 @@
 	$(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
-	external/astl/include \
 	$(MESA_TOP)/src/mapi \
 	$(MESA_TOP)/src/mesa
 
 LOCAL_MODULE := libmesa_glsl
 
+include external/stlport/libstlport.mk
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)