android: anv: libmesa_vulkan_common: add libmesa_util static dependency

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

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 5d2ec4f76c7b42a81e074327228887c3dbf00711..468ddfc65f88dc94b5faea8647eb3ca95bbc6429 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -189,6 +189,28 @@ LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+#
+# libanv for gen12
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen12
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(VULKAN_GEN12_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=120
+
+LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
+
+LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES)
+
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+
 #
 # libmesa_vulkan_common
 #
@@ -211,7 +233,8 @@ LOCAL_STATIC_LIBRARIES := \
        libmesa_nir \
        libmesa_genxml \
        libmesa_git_sha1 \
-       libmesa_vulkan_util
+       libmesa_vulkan_util \
+       libmesa_util
 
 # The rule generates both C and H files, but due to some strange
 # reason generating the files once leads to link-time issues.
@@ -290,6 +313,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_anv_gen9 \
        libmesa_anv_gen10 \
        libmesa_anv_gen11 \
+       libmesa_anv_gen12 \
        libmesa_intel_compiler
 
 LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog
@@ -304,5 +328,9 @@ else
         libexpat
 endif
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_STATIC_LIBRARIES += libgrallocusage
+endif
+
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)