st/mesa: fix lowered IO - don't call st_nir_assign_vs_in_locations twice

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

diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index 4802757955f0316d78e782992796af2fc04f6244..66b6ef13a613d15bf824ef3606e9dc507ebd9eb8 100644 (file)
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -35,9 +35,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_glsl_utils
 
+LOCAL_C_INCLUDES := \
+       $(MESA_TOP)/src/compiler/nir \
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
+
 LOCAL_SRC_FILES := \
-       program/hash_table.c \
-       program/symbol_table.c
+       main/extensions_table.c \
+       program/symbol_table.c \
+       program/dummy_errors.c
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
@@ -50,10 +57,18 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_glsl_utils
 LOCAL_IS_HOST_MODULE := true
+LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
+
+LOCAL_C_INCLUDES := \
+       $(MESA_TOP)/src/compiler/nir \
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_SRC_FILES := \
-       program/hash_table.c \
-       program/symbol_table.c
+       main/extensions_table.c \
+       program/symbol_table.c \
+       program/dummy_errors.c
 
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)