android: virgl: fix libmesa_winsys_virgil_common build and dependencies
authorMauro Rossi <issor.oruam@gmail.com>
Sat, 15 Jun 2019 05:39:02 +0000 (07:39 +0200)
committerMauro Rossi <issor.oruam@gmail.com>
Fri, 21 Jun 2019 13:53:29 +0000 (15:53 +0200)
commit60c581b57d9ce5f56900cdbd6cd7f02d125f0635
tree4a023c2b8c5248a6eb34cdb176f7a4b478e6bfca
parentcf389ba89507b20dee1ac640b3a496aa86f82ac1
android: virgl: fix libmesa_winsys_virgil_common build and dependencies

Fixes the following building errors and resolves Bug 110922
Fixes gallium_dri target missing symbols at linking.

external/mesa/src/gallium/winsys/virgl/drm/Android.mk:
error: libmesa_winsys_virgl (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)
...
external/mesa/src/gallium/winsys/virgl/vtest/Android.mk:
error: libmesa_winsys_virgl_vtest (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)
...
build/core/main.mk:728: error: exiting from previous errors.

In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c:34:
external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:
fatal error: 'virgl_resource_cache.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c:32:
external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:
fatal error: 'virgl_resource_cache.h' file not found
#include "virgl_resource_cache.h"
         ^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: b18f09a ("virgl: Introduce virgl_resource_cache")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Clayton Craft <clayton.a.craft@intel.com>
src/gallium/Android.mk
src/gallium/drivers/virgl/Android.mk
src/gallium/winsys/virgl/drm/Android.mk
src/gallium/winsys/virgl/vtest/Android.mk