X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fintel%2FAndroid.vulkan.mk;h=c5280b0bf04213b362c023b4147c31e81e23c69e;hp=f66ab5bdfa49bbb0558c330a0168531ccd6a7637;hb=240c0746d1617690ede440794eb4aa981784f5df;hpb=aba57b11ee8c6d4be225f6e22ae00d96b1833d73

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index f66ab5bdfa4..c5280b0bf04 100644
--- 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.
@@ -282,6 +305,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_compiler \
 	libmesa_intel_common \
 	libmesa_intel_dev \
+	libmesa_intel_perf \
 	libmesa_vulkan_common \
 	libmesa_vulkan_util \
 	libmesa_anv_gen7 \
@@ -290,6 +314,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,9 +329,5 @@ 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)