android: fix build by removing references to dri-search-path

In commit 41e83b243c (meson: remove dri-search-path, 2024-09-18) the
`dri-search-path` meson option was removed but its usage in the Android
build files was left there, resulting in the following error when
building for Android:

-----------------------------------------------------------------------
FAILED: out/target/product/vsoc_x86_64/obj_x86/MESON_MESA3D/.build.timestamp
...

meson.build:4:0: ERROR: Unknown options: "dri-search-path"
-----------------------------------------------------------------------

Remove the usage of the option when building for Android, and while at
it remove also any mention of if in docs/drivers/llvmpipe.rst

Remove also the MESA3D_LIB_DIR variable which was used only for
dri-search-path.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31266>
This commit is contained in:
Antonio Ospite
2024-09-19 17:51:02 +02:00
committed by Marge Bot
parent 7c01cbda6f
commit cebaa64ee3
2 changed files with 1 additions and 7 deletions

View File

@@ -57,8 +57,6 @@ link_deps := \
# Build mesa3d using intermediate variables provided by AOSP make/core internals
M_TARGET_PREFIX := $(my_2nd_arch_prefix)
MESA3D_LIB_DIR := lib$(subst 32,,$(LOCAL_MULTILIB))
MESON_OUT_DIR := $($(M_TARGET_PREFIX)TARGET_OUT_INTERMEDIATES)/MESON_MESA3D
MESON_GEN_DIR := $(MESON_OUT_DIR)_GEN
MESON_GEN_FILES_TARGET := $(MESON_GEN_DIR)/.timestamp
@@ -83,7 +81,6 @@ MESON_GEN_NINJA := \
cd $(MESON_OUT_DIR) && PATH=/usr/bin:/usr/local/bin:$$PATH meson ./build \
--cross-file $(call relative-to-absolute,$(MESON_GEN_DIR))/aosp_cross \
--buildtype=release \
-Ddri-search-path=/vendor/$(MESA3D_LIB_DIR)/dri \
-Dplatforms=android \
-Dplatform-sdk-version=$(PLATFORM_SDK_VERSION) \
-Dgallium-drivers=$(subst $(space),$(comma),$(BOARD_MESA3D_GALLIUM_DRIVERS)) \

View File

@@ -153,10 +153,7 @@ file like this would work ``subprojects/llvm/meson.build`` where
Afterwards you can continue following the instructors to build mesa
on :doc:`Android <../android>` and follow the steps to add the driver
directly to an Android OS image. Please note that you'll need to set
``-Ddri-search-path`` when building the driver, so that the loader
will be able to find the driver libraries in the vendor partition
``/vendor/lib(64)/egl``.
directly to an Android OS image.
Using
-----