android: ensure building with stlport

Without adding the include path of stlport, it may include (incorrect)
headers from the toolchain.

diff --git a/Android.llvm.mk b/Android.llvm.mk
index f9e6e9e..877bd3c 100644 (file)
--- a/Android.llvm.mk
+++ b/Android.llvm.mk
@@ -77,6 +77,7 @@ LLVM_ROOT_PATH := external/llvm
 include $(LLVM_ROOT_PATH)/llvm-device-build.mk
 endif
 
+include external/stlport/libstlport.mk
 # this is a shared library
 ifeq ($(strip $(LOCAL_MODULE_CLASS)),SHARED_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += libstlport

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index d7d17dd..bcf0711 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -44,6 +44,7 @@ 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)