From 07f3b62d59d55fc22cf10f7c161b38fa2ab7f06b Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Fri, 3 Oct 2025 20:43:10 +0200 Subject: [PATCH] android: fix building rules for i915, r300 Changes required to avoid meson.build errors after commit b8b38d38 Fixes: b8b38d38 ("meson: reinstate LLVM requirement for r300 and enforce it for i915 too") Reviewed-by: Valentine Burley Reviewed-by: Antonio Ospite Part-of: --- android/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/Android.mk b/android/Android.mk index 5b948b4cf5b..aaddb17a8a4 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -60,6 +60,10 @@ LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers MESON_GEN_PKGCONFIGS := log cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf LOCAL_CFLAGS += $(BOARD_MESA3D_CFLAGS) +ifneq ($(filter i915 r300,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) +MESON_GEN_LLVM_STUB := true +endif + ifneq ($(filter llvmpipe swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) ifeq ($(BOARD_MESA3D_FORCE_SOFTPIPE),) MESON_GEN_LLVM_STUB := true