From ff6b181c2d33be1e3fffeb3ce6c7b411754ba7ff Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 11 May 2025 15:20:25 +0200 Subject: [PATCH] android: fix llvmpipe build rules llvmpipe driver name needs to be added to the list triggering MESON_GEN_LLVM_STUB := true due to swrast driver name being an invalid gallium driver swrast driver name is still used for lavapipe vulkan driver Fixes: a3909092 ("meson: drop deprecated `swrast` alias for softpipe+llvmpipe") Backport-to: 25.1 Part-of: --- android/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/Android.mk b/android/Android.mk index 5fae22c2de9..86412bdca22 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -56,7 +56,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 35; echo $$?), 0) LOCAL_STATIC_LIBRARIES += libc++fs endif -ifneq ($(filter swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) +ifneq ($(filter llvmpipe swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) ifeq ($(BOARD_MESA3D_FORCE_SOFTPIPE),) MESON_GEN_LLVM_STUB := true endif