diff options
| author | Samuel Holland <samuel.holland@sifive.com> | 2023-06-20 12:32:07 -0700 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-09-15 18:43:02 +0000 |
| commit | 497aecb210094d83f3b3be3a59f7210f610c33a6 (patch) | |
| tree | 9d027664055183e05b7d096c49a6d7ec8f2fbb8e | |
| parent | ec32619cb0475016b6d3519b999461e17acdf04c (diff) | |
| download | mesa-497aecb210094d83f3b3be3a59f7210f610c33a6.tar.gz mesa-497aecb210094d83f3b3be3a59f7210f610c33a6.tar.bz2 mesa-497aecb210094d83f3b3be3a59f7210f610c33a6.zip | |
Android.mk: Only link LLVM for radeonsi, not amd_vk
When building for Android, avoid the LLVM dependency if possible.
Cc: mesa-stable
Acked-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Change-Id: Idda03f954b4b5326e23a848e541411b60fcef063
Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24007>
| -rw-r--r-- | android/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/Android.mk b/android/Android.mk index dc25d0d00e5..24110e25d68 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -61,9 +61,12 @@ LOCAL_SHARED_LIBRARIES += libdrm_intel MESON_GEN_PKGCONFIGS += libdrm_intel:$(LIBDRM_VERSION) endif -ifneq ($(filter radeonsi amd,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) +ifneq ($(filter radeonsi,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) MESON_GEN_LLVM_STUB := true LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions +endif + +ifneq ($(filter radeonsi amd,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) LOCAL_SHARED_LIBRARIES += libdrm_amdgpu MESON_GEN_PKGCONFIGS += libdrm_amdgpu:$(LIBDRM_VERSION) endif |