android/i965: add libmesa_i965_compiler static library

this will be shared between OpenGL and Vulkan drivers

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index b4f1adf6ca8331d5967b745147daf4b023f857c3..7dea3c25076ff0d2e1f01cb2f96df4431a38b417 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -151,6 +151,32 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=90
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+# ---------------------------------------
+# Build libmesa_i965_compiler
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_compiler
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := \
+       $(i965_compiler_FILES)
+
+LOCAL_C_INCLUDES := \
+       $(MESA_DRI_C_INCLUDES) \
+       $(MESA_TOP)/src/intel \
+       $(MESA_TOP)/src/compiler/nir \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,)/glsl
+
+LOCAL_SHARED_LIBRARIES := \
+       libdrm_intel
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 # ---------------------------------------
 # Build i965_dri
 # ---------------------------------------
@@ -177,7 +203,6 @@ LOCAL_C_INCLUDES := \
        $(MESA_DRI_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
-       $(i965_compiler_FILES) \
        $(i965_FILES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -185,7 +210,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        $(I965_PERGEN_LIBS) \
        libmesa_intel_common \
        libmesa_blorp \
-       libmesa_isl
+       libmesa_isl \
+       libmesa_i965_compiler
 
 LOCAL_SHARED_LIBRARIES := \
        $(MESA_DRI_SHARED_LIBRARIES) \
@@ -195,7 +221,5 @@ LOCAL_GENERATED_SOURCES := \
        $(MESA_DRI_OPTIONS_H) \
        $(MESA_GEN_NIR_H)
 
-include $(LOCAL_PATH)/Android.gen.mk
-
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)