Mesa (master): android: freedreno/ir3: Switch over to new encoder/decoder

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b53d404aa73d3dd71c5e9a5005b46c860c8a4eca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b53d404aa73d3dd71c5e9a5005b46c860c8a4eca

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Jan 16 21:46:23 2021 +0100

android: freedreno/ir3: Switch over to new encoder/decoder

Fixes the following building error:

FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so
...
ld.lld: error: undefined symbol: isa_assemble
>>> referenced by ir3_shader.c:151 (external/mesa/src/freedreno/ir3/ir3_shader.c:151)
...
ld.lld: error: undefined symbol: isa_decode
>>> referenced by ir3_shader.c:668 (external/mesa/src/freedreno/ir3/ir3_shader.c:668)

Fixes: 5cae4779c ("freedreno/ir3: Switch over to new encoder/decoder")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Acked-by: Rob Clark <robclark at freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8538>

---

 src/freedreno/Android.ir3.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk
index d08a6d789b6..0fbb8c50ca6 100644
--- a/src/freedreno/Android.ir3.mk
+++ b/src/freedreno/Android.ir3.mk
@@ -46,6 +46,10 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/freedreno/ir3 \
 	$(intermediates)/ir3
 
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+	libir3decode \
+	libir3encode
+
 # We need libmesa_nir to get NIR's generated include directories.
 LOCAL_STATIC_LIBRARIES := \
 	libmesa_nir