Module: Mesa Branch: main Commit: 05fb6b9c7d768b95c75a1f6cd2885cb6e12dcb95 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05fb6b9c7d768b95c75a1f6cd2885cb6e12dcb95
Author: Mauro Rossi <issor.or...@gmail.com> Date: Fri Nov 3 18:05:56 2023 -0400 Android.mk: be able to build radeonsi without llvm Android.mk rules for radeonsi are updated according to commit 0a56417 "meson: be able to build radeonsi without llvm" cflag -DFORCE_BUILD_AMDGPU is required when building radeonsi with llvm support based on android-x86 downstream LLVM fork that follows the AOSP llvm build rules. Reviewed-by: Roman Stratiienko <r.stratiie...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26049> --- android/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/Android.mk b/android/Android.mk index d6e2b708446..809be3af29f 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -62,8 +62,11 @@ MESON_GEN_PKGCONFIGS += libdrm_intel:$(LIBDRM_VERSION) endif ifneq ($(filter radeonsi,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) -MESON_GEN_LLVM_STUB := true +ifneq ($(MESON_GEN_LLVM_STUB),) LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions +# The flag is required for the Android-x86 LLVM port that follows the AOSP LLVM porting rules +# https://osdn.net/projects/android-x86/scm/git/external-llvm-project +endif endif ifneq ($(filter radeonsi amd,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),)
