glsl: avoid using gl context as a memory context

[mesa.git] / src / glsl / Android.mk

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 754f3ccedca3fbf7c39dfb1e91f6a7c38dc7a5e5..f5006ab03f62e69c318acfccd3fe29056f9dcb66 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -27,6 +27,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/Makefile.sources
 
+GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------
@@ -35,10 +36,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
        $(LIBGLCPP_FILES) \
-       $(LIBGLSL_FILES) \
-       $(LIBGLSL_CXX_FILES)
+       $(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
+       external/astl/include \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
@@ -57,8 +58,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        $(LIBGLCPP_FILES) \
        $(LIBGLSL_FILES) \
-       $(LIBGLSL_CXX_FILES) \
-       $(BUILTIN_COMPILER_CXX_FILES) \
+       $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
        $(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \