glx/test: meson: assorted include fixes

[mesa.git] / src / intel / Android.isl.mk

diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
index 7e578af170eab60381ecf271df4749950f423c83..23cff55d2515d4431bf3afbaf358a93f09397190 100644 (file)
--- a/src/intel/Android.isl.mk
+++ b/src/intel/Android.isl.mk
@@ -25,8 +25,7 @@
 # ---------------------------------------
 
 LIBISL_GENX_COMMON_INCLUDES := \
-       $(MESA_TOP)/src/ \
-       $(MESA_TOP)/src/mesa/drivers/dri/i965
+       $(MESA_TOP)/src/
 
 # ---------------------------------------
 # Build libmesa_isl_gen4
@@ -161,6 +160,44 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+# ---------------------------------------
+# Build libmesa_isl_gen10
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_isl_gen10
+
+LOCAL_SRC_FILES := $(ISL_GEN10_FILES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=100
+
+LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
+# Build libmesa_isl_gen11
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_isl_gen11
+
+LOCAL_SRC_FILES := $(ISL_GEN11_FILES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=110
+
+LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 # ---------------------------------------
 # Build libmesa_isl
 # ---------------------------------------
@@ -176,7 +213,7 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/mesa/drivers/dri/i965 \
+       $(MESA_TOP)/src/intel
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel
 
@@ -187,7 +224,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_isl_gen7 \
        libmesa_isl_gen75 \
        libmesa_isl_gen8 \
-       libmesa_isl_gen9
+       libmesa_isl_gen9 \
+       libmesa_isl_gen10 \
+       libmesa_isl_gen11 \
+       libmesa_genxml
 
 # Autogenerated sources