summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorChih-Wei Huang <[email protected]>2015-05-20 11:25:39 +0800
committerEric Anholt <[email protected]>2015-06-09 12:25:50 -0700
commitc5e11e5f7f67fe5a1d28b1446f87af7aa3ba68d8 (patch)
treec7112533346a1c976e9a81fcb24e307cfb75f6df /src/glsl
parent1842832660c4eade037caa760110b58a2d7f055b (diff)
android: build with libcxx on android lollipop
On Lollipop, apparently stlport is gone and libcxx must be used instead. We still support stlport when building on earlier android releases. Signed-off-by: Chih-Wei Huang <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index f20741e0d0f..f63b7daf26e 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -46,7 +46,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE := libmesa_glsl
-include external/stlport/libstlport.mk
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)