glx: Sync <GL/glxext.h> with Khronos

[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 9e150eaa3c0fa8ef8609b5477f7f7ee52c0bfd95..0d83cd5a9bfa08d92c76af00672d7692043ff959 100644 (file)
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -36,15 +36,14 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_glsl_utils
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/glsl/nir \
+       $(MESA_TOP)/src/compiler/nir \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_SRC_FILES := \
+       main/extensions_table.c \
        main/imports.c \
-       program/prog_hash_table.c \
        program/symbol_table.c \
        program/dummy_errors.c
 
@@ -62,15 +61,14 @@ LOCAL_IS_HOST_MODULE := true
 LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/glsl/nir \
+       $(MESA_TOP)/src/compiler/nir \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_SRC_FILES := \
+       main/extensions_table.c \
        main/imports.c \
-       program/prog_hash_table.c \
        program/symbol_table.c \
        program/dummy_errors.c