diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2021-08-10 13:10:44 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-08-16 09:18:46 +0000 |
| commit | a70ff21efbb48f851c5cdd10c43c4c8a3d49b071 (patch) | |
| tree | 5d261d90c19040f7deaf8ccd90354d6c8d2ddd78 /android | |
| parent | 71595a189a0c372efd520ad51866ca57aa83298c (diff) | |
AOSP: Extract version from libdrm instead of hardcoding it.
mesa3d require up-to-date version of libdrm.
Hardcoding it to 2.4.105 is wrong.
Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson")
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Tested-by: Mauro Rossi <issor.oruam@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12304>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/android/Android.mk b/android/Android.mk index 243da8493af..ed310929a29 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -26,6 +26,8 @@ ifneq ($(filter true, $(BOARD_MESA3D_USES_MESON_BUILD)),) LOCAL_PATH := $(call my-dir) MESA3D_TOP := $(dir $(LOCAL_PATH)) +LIBDRM_VERSION = $(shell cat external/libdrm/meson.build | grep -o "\<version\>\s*:\s*'\w*\.\w*\.\w*'" | grep -o "\w*\.\w*\.\w*" | head -1) + MESA_VK_LIB_SUFFIX_amd := radeon MESA_VK_LIB_SUFFIX_intel := intel MESA_VK_LIB_SUFFIX_freedreno := freedreno @@ -38,7 +40,7 @@ include $(CLEAR_VARS) LOCAL_SHARED_LIBRARIES := libc libdl libdrm libm liblog libcutils libz libc++ libnativewindow libsync libhardware LOCAL_STATIC_LIBRARIES := libexpat libarect libelf LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers libbacktrace_headers -MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:2.4.105 nativewindow sync zlib:1.2.11 libelf +MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf ifneq ($(filter swr swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) MESON_GEN_LLVM_STUB := true @@ -51,24 +53,24 @@ endif ifneq ($(filter iris,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) LOCAL_SHARED_LIBRARIES += libdrm_intel -MESON_GEN_PKGCONFIGS += libdrm_intel:2.4.105 +MESON_GEN_PKGCONFIGS += libdrm_intel:$(LIBDRM_VERSION) endif ifneq ($(filter radeonsi amd,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) MESON_GEN_LLVM_STUB := true LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions LOCAL_SHARED_LIBRARIES += libdrm_amdgpu -MESON_GEN_PKGCONFIGS += libdrm_amdgpu:2.4.105 +MESON_GEN_PKGCONFIGS += libdrm_amdgpu:$(LIBDRM_VERSION) endif ifneq ($(filter radeonsi r300 r600,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) LOCAL_SHARED_LIBRARIES += libdrm_radeon -MESON_GEN_PKGCONFIGS += libdrm_radeon:2.4.105 +MESON_GEN_PKGCONFIGS += libdrm_radeon:$(LIBDRM_VERSION) endif ifneq ($(filter nouveau,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) LOCAL_SHARED_LIBRARIES += libdrm_nouveau -MESON_GEN_PKGCONFIGS += libdrm_nouveau:2.4.105 +MESON_GEN_PKGCONFIGS += libdrm_nouveau:$(LIBDRM_VERSION) endif ifneq ($(MESON_GEN_LLVM_STUB),) |