summaryrefslogtreecommitdiff
path: root/android/mesa3d_cross.mk
diff options
context:
space:
mode:
authorRoman Stratiienko <r.stratiienko@gmail.com>2022-09-10 18:42:50 +0300
committerMarge Bot <emma+marge@anholt.net>2022-09-12 07:37:27 +0000
commit62ef714ce47c887e3e294a9ceddb83f83138a0f6 (patch)
tree5f74ed1c6fd8bde79382a209a65465d958b48b6d /android/mesa3d_cross.mk
parent28af93ace7b4a5d7dfd1cbfa6ab14ffcb86ad6ba (diff)
downloadmesa-62ef714ce47c887e3e294a9ceddb83f83138a0f6.tar.gz
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 <r.stratiienko@gmail.com> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18533>
Diffstat (limited to 'android/mesa3d_cross.mk')
-rw-r--r--android/mesa3d_cross.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk
index c6c2157f542..a927b6eb7ab 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 := \