From 7e4f9ab45dc41997338b1f3c5633733e4ba834e3 Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35121>
(cherry picked from commit ff6b181c2d33be1e3fffeb3ce6c7b411754ba7ff)
---
 .pick_status.json  | 2 +-
 android/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9e9faa9faed..2b43213182e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4934,7 +4934,7 @@
         "description": "android: fix llvmpipe build rules",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a39090921e3efad84e4eb16bc82f2d4519391a82",
         "notes": null
diff --git a/android/Android.mk b/android/Android.mk
index 4f3a69a8e81..2aaa3f7e388 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