android: radeonsi: fix build after vl refactoring (v2)
authorMauro Rossi <issor.oruam@gmail.com>
Sat, 16 Nov 2019 17:39:31 +0000 (18:39 +0100)
committermaurossi <issor.oruam@gmail.com>
Thu, 5 Dec 2019 08:08:23 +0000 (08:08 +0000)
commit96aef08dc6f4ea4a79cdf995d867d08e8f838b2a
treec2280d470eafb136b31132e23c86eed3963da0fb
parent32ebd4207ad9411bc790b5e2c7e8d2a4f21c3d67
android: radeonsi: fix build after vl refactoring (v2)

vl functions moved from radeonsi to gallium/auxiliary/vl have left
android build of radeonsi in broken state.

libmesa_galliumvl static is need to build readeonsi,
gallium_dri building rules are reworked to avoid multiple symbols
and libmesa_galliumvl static dependency is needed in radeonsi.

Here is the changelog:
- android: gallium/auxiliary: add libmesa_galliumvl static
- android: gallium_dri: move libmesa_gallium to static to prevent multiple symbols
- android: radeonsi: fix build after vl refactoring

Fixes the following building error:

external/mesa/src/gallium/drivers/radeonsi/si_uvd.c:47:
error: undefined reference to 'vl_video_buffer_create_as_resource'
clang.real: error: linker command failed with exit code 1 (use -v to see invocation)

Fixes: 86e60bc ("radeonsi: remove si_vid_join_surfaces and use combined planar allocations")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/auxiliary/Android.mk
src/gallium/drivers/radeonsi/Android.mk
src/gallium/targets/dri/Android.mk