summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-07-28 20:24:02 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-25 23:39:47 +0100
commit0e52107ff8ed7440785f7af58849dd90df212269 (patch)
tree136c76fc1e0a4aeecaf3076e881df2cdf925ab1d /src
parentaba5b1506868731e8e59eea4344d968afe93912e (diff)
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> (cherry picked from commit 07f583186dd4c5a92f6382c4c232a6a96bd049a6)
Diffstat (limited to 'src')
-rw-r--r--src/glsl/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 8a394265299..7b1fa7e532b 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -39,12 +39,12 @@ LOCAL_SRC_FILES := \
$(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)