diff options
| author | Antonio Ospite <antonio.ospite@collabora.com> | 2024-08-13 10:44:50 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2024-08-14 16:07:01 +0200 |
| commit | 5854ff2dd9e0e16def62019441a6cd7d55b61e28 (patch) | |
| tree | ebf5c8f4e7650f4eb5aef25f7183242aa1da9640 /src/gallium | |
| parent | 9f8856c5af60e49e4dfb48cce7343fde44c0cc68 (diff) | |
android: simplify building libgallium_dri on Android
The versioned libgallium library can be confusing on Android, and it is
probably not even needed there, so simplify the build on Android by
always build the unversioned `libgallium_dri.so` overriding the
`-Dunversion-libgallium=true` option added in
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30579
Remove also all the bits that deal with the versioned library which are
not needed anymore.
Fixes: 9568976c52a ("android: fix build in multiple ways")
Acked-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Mauro Rossi <issor.oruam@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30641>
(cherry picked from commit 2d2bc5b307f9099c79618ea0bae37e31d7bfbcc2)
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index c58eaaa220c..ad7302e74ac 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -22,7 +22,7 @@ if with_ld_dynamic_list gallium_dri_link_depends += files('../dri.dyn') endif -if get_option('unversion-libgallium') +if get_option('unversion-libgallium') or with_platform_android libgallium_name = 'gallium_dri' else libgallium_name = 'gallium-@0@'.format(meson.project_version()) |