From 54f4be262016b19009296dfda3f5aba6c10be16f Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Tue, 23 Feb 2021 21:50:18 +0100 Subject: [PATCH] android: pan/bi: reorder static dependencies in gallium/dri 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 Fixes: 166630f ("android: pan/bi: Separate disasm/compiler targets") Acked-by: Alyssa Rosenzweig Part-of: (cherry picked from commit 97b7786e6be1adf5e023d3ebd1fe54bf25d3fd26) --- .pick_status.json | 2 +- src/gallium/targets/dri/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 748ca3c7f95..3c79df743ef 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index c2bf3f14cae..f290c141c59 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -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 \