fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 14:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: pan/bi: reorder static dependencies in gallium/dri

Browse source 
libpanfrost_lib depends on libpanfrost_bifrost for 'bifrost_compile_shader_nir' symbol
libpanfrost_lib depends on libpanfrost_bifrost_disasm for 'disassemble_bifrost' symbol
LOCAL_STATIC_LIBRARIES requires proper ordering to make the symbols available

Fixes the following building error happening with Android P:

FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so
external/mesa/src/panfrost/lib/decode.c:534: error: undefined reference to 'disassemble_bifrost'
external/mesa/src/panfrost/lib/pan_shader.c:145: error: undefined reference to 'bifrost_compile_shader_nir'

Cc: 20.3 21.0 <mesa-stable@lists.freedesktop.org>
Fixes: 166630f ("android: pan/bi: Separate disasm/compiler targets")
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9265>
(cherry picked from commit 97b7786e6b)
This commit is contained in:
Mauro Rossi 2021-02-23 21:50:18 +01:00 • committed by Dylan Baker
parent d5525a84a7
commit 54f4be2620
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3964,7 +3964,7 @@
"description": "android: pan/bi: reorder static dependencies in gallium/dri",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "166630f759246cc1a49ece8dc3feb4e3d6a777a2"
},

2
src/gallium/targets/dri/Android.mk
View file

@ -63,9 +63,9 @@ LOCAL_STATIC_LIBRARIES += \
libfreedreno_ir3 \
libfreedreno_perfcntrs \
libmesa_gallium \
libpanfrost_lib \
libpanfrost_bifrost \
libpanfrost_bifrost_disasm \
libpanfrost_lib \
libpanfrost_midgard \
libpanfrost_midgard_disasm \
libpanfrost_shared \