From a1333d60e9f54ae88a22d43105e039f3412d74b9 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 26 Jan 2025 16:52:06 +0100 Subject: [PATCH] android: remove shared-glapi building rules Changes required after commit 44bda7c2 Fixes the following building error: FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/libglapi_intermediates/libglapi.so ... 'out/target/product/x86_64/obj/MESON_MESA3D/install/usr/local/lib/libglapi.so': No such file or directory Fixes: 44bda7c2 ("dri: put shared-glapi into libgallium.*.so, remove the remap table to reduce GL dispatch overhead") Part-of: --- android/Android.mk | 2 -- android/mesa3d_cross.mk | 2 -- 2 files changed, 4 deletions(-) diff --git a/android/Android.mk b/android/Android.mk index d5b4c10abac..1df8da523af 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -169,8 +169,6 @@ ifneq ($(strip $(BOARD_MESA3D_GALLIUM_DRIVERS)),) # Module 'libgallium_dri', produces '/vendor/lib{64}/libgallium_dri.so' # This module also trigger DRI symlinks creation process $(eval $(call mesa3d-lib,libgallium_dri,,MESA3D_GALLIUM_BIN)) -# Module 'libglapi', produces '/vendor/lib{64}/libglapi.so' -$(eval $(call mesa3d-lib,libglapi,,MESA3D_LIBGLAPI_BIN)) # Module 'libEGL_mesa', produces '/vendor/lib{64}/egl/libEGL_mesa.so' $(eval $(call mesa3d-lib,libEGL_mesa,egl,MESA3D_LIBEGL_BIN)) diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index b83427927f4..ddb29151df3 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -68,7 +68,6 @@ $(M_TARGET_PREFIX)MESA3D_GALLIUM_BIN := $(MESON_OUT_DIR)/install/usr/local/l $(M_TARGET_PREFIX)MESA3D_LIBEGL_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libEGL.so $(M_TARGET_PREFIX)MESA3D_LIBGLESV1_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv1_CM.so $(M_TARGET_PREFIX)MESA3D_LIBGLESV2_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libGLESv2.so -$(M_TARGET_PREFIX)MESA3D_LIBGLAPI_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libglapi.so $(M_TARGET_PREFIX)MESA3D_LIBGBM_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/$(MESA_LIBGBM_NAME).so $(M_TARGET_PREFIX)MESA3D_DRI_GBM_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/gbm/dri_gbm.so @@ -82,7 +81,6 @@ MESA3D_GLES_BINS := \ $($(M_TARGET_PREFIX)MESA3D_LIBEGL_BIN) \ $($(M_TARGET_PREFIX)MESA3D_LIBGLESV1_BIN) \ $($(M_TARGET_PREFIX)MESA3D_LIBGLESV2_BIN) \ - $($(M_TARGET_PREFIX)MESA3D_LIBGLAPI_BIN) \ MESON_GEN_NINJA := \ cd $(MESON_OUT_DIR) && PATH=/usr/bin:/usr/local/bin:$$PATH meson ./build \