mesa: Fix linker-assigned varying component counting since 8fb1e4a462

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

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index d7d17dd6d9afa66d6e0df1f5c8c0d9b5f4fa7ee3..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
 # ---------------------------------------
@@ -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) \
+       $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
+       $(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 \