From 62ef714ce47c887e3e294a9ceddb83f83138a0f6 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Sat, 10 Sep 2022 18:42:50 +0300 Subject: [PATCH] Android: Use libgbm_mesa name for SDK30+ libgbm.so name has been occupied in AOSP by minigbm starting from Android-11 (SDKv30). In AOSP's mesa3d fork, libgbm was renamed to libgbm_mesa. Signed-off-by: Roman Stratiienko Reviewed-by: Yiwei Zhang Part-of: --- android/Android.mk | 8 +++++++- android/mesa3d_cross.mk | 2 +- src/gbm/meson.build | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/android/Android.mk b/android/Android.mk index 1a53fbd73f54a..49fdd56443cfe 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -100,6 +100,12 @@ endif __MY_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 30; echo $$?), 0) +MESA_LIBGBM_NAME := libgbm_mesa +else +MESA_LIBGBM_NAME := libgbm +endif + ifeq ($(TARGET_IS_64_BIT),true) LOCAL_MULTILIB := 64 else @@ -170,7 +176,7 @@ $(foreach driver,$(BOARD_MESA3D_VULKAN_DRIVERS), \ ifneq ($(filter true, $(BOARD_MESA3D_BUILD_LIBGBM)),) # Modules 'libgbm', produces '/vendor/lib{64}/libgbm.so' -$(eval $(call mesa3d-lib,libgbm,.so.1,,MESA3D_LIBGBM_BIN,$(MESA3D_TOP)/src/gbm/main)) +$(eval $(call mesa3d-lib,$(MESA_LIBGBM_NAME),.so.1,,MESA3D_LIBGBM_BIN,$(MESA3D_TOP)/src/gbm/main)) endif #------------------------------------------------------------------------------- diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index c6c2157f542df..a927b6eb7ab67 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -69,7 +69,7 @@ $(M_TARGET_PREFIX)MESA3D_LIBEGL_BIN := $(MESON_OUT_DIR)/install/usr/local/l $(M_TARGET_PREFIX)MESA3D_LIBGLESV1_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv1_CM.so.1.1.0 $(M_TARGET_PREFIX)MESA3D_LIBGLESV2_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv2.so.2.0.0 $(M_TARGET_PREFIX)MESA3D_LIBGLAPI_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libglapi.so.0.0.0 -$(M_TARGET_PREFIX)MESA3D_LIBGBM_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libgbm.so.1.0.0 +$(M_TARGET_PREFIX)MESA3D_LIBGBM_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/$(MESA_LIBGBM_NAME).so.1.0.0 MESA3D_GLES_BINS := \ diff --git a/src/gbm/meson.build b/src/gbm/meson.build index ccdc517fc5686..df65361aef74a 100644 --- a/src/gbm/meson.build +++ b/src/gbm/meson.build @@ -45,8 +45,14 @@ if with_platform_wayland incs_gbm += inc_wayland_drm endif +libgbm_name = 'gbm' + +if with_platform_android and get_option('platform-sdk-version') >= 30 + libgbm_name = 'gbm_mesa' +endif + libgbm = shared_library( - 'gbm', + libgbm_name, files_gbm, include_directories : incs_gbm, c_args : [args_gbm],