X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fglsl%2FAndroid.mk;h=f088e67cbe8b84d1e91be59c9cc7f9ed0c9ff87d;hb=15085b477b092ba4315d13b96112a8d714de8e27;hp=d7d17dd6d9afa66d6e0df1f5c8c0d9b5f4fa7ee3;hpb=fb0e4a23fab6992e827f0b62d5326745065074a2;p=mesa.git

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index d7d17dd6d9a..f088e67cbe8 100644
--- 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
 # ---------------------------------------
@@ -34,11 +35,11 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	$(LIBGLCPP_SOURCES) \
-	$(LIBGLSL_SOURCES) \
-	$(LIBGLSL_CXX_SOURCES)
+	$(LIBGLCPP_FILES) \
+	$(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
+	external/astl/include \
 	$(MESA_TOP)/src/mapi \
 	$(MESA_TOP)/src/mesa
 
@@ -55,11 +56,10 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	$(LIBGLCPP_SOURCES) \
-	$(LIBGLSL_SOURCES) \
-	$(LIBGLSL_CXX_SOURCES) \
-	$(BUILTIN_COMPILER_CXX_SOURCES) \
-	$(GLSL_COMPILER_CXX_SOURCES)
+	$(LIBGLCPP_FILES) \
+	$(LIBGLSL_FILES) \
+	$(BUILTIN_COMPILER_CXX_FILES) \
+	$(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/mapi \
@@ -82,7 +82,7 @@ include $(BUILD_HOST_EXECUTABLE)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	$(GLSL_COMPILER_CXX_SOURCES)
+	$(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/mapi \