<div dir="ltr"><div>Hi,</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jun 24, 2019 at 8:55 AM Chih-Wei Huang <<a href="mailto:cwhuang@android-x86.org">cwhuang@android-x86.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>> 於 2019年6月15日 週六 下午1:39寫道：<br>
><br>
> Fixes the following building errors and resolves Bug 110922<br>
> Fixes gallium_dri target missing symbols at linking.<br>
><br>
> external/mesa/src/gallium/winsys/virgl/drm/Android.mk:<br>
> error: libmesa_winsys_virgl (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)<br>
> ...<br>
> external/mesa/src/gallium/winsys/virgl/vtest/Android.mk:<br>
> error: libmesa_winsys_virgl_vtest (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)<br>
> ...<br>
> build/core/<a href="http://main.mk:728" rel="noreferrer" target="_blank">main.mk:728</a>: error: exiting from previous errors.<br>
><br>
> In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c:34:<br>
> external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:<br>
> fatal error: 'virgl_resource_cache.h' file not found<br>
> ^~~~~~~~~~~~~~~~~~~~~~~~<br>
> 1 error generated.<br>
><br>
> In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c:32:<br>
> external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:<br>
> fatal error: 'virgl_resource_cache.h' file not found<br>
> #include "virgl_resource_cache.h"<br>
> ^~~~~~~~~~~~~~~~~~~~~~~~<br>
> 1 error generated.<br>
><br>
> Fixes: b18f09a ("virgl: Introduce virgl_resource_cache")<br>
> Signed-off-by: Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>><br>
> ---<br>
> src/gallium/Android.mk | 2 +-<br>
> src/gallium/drivers/virgl/Android.mk | 2 +-<br>
> src/gallium/winsys/virgl/drm/Android.mk | 2 ++<br>
> src/gallium/winsys/virgl/vtest/Android.mk | 2 ++<br>
> 4 files changed, 6 insertions(+), 2 deletions(-)<br>
><br>
> diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk<br>
> index 3a3f042c7a..37e923c225 100644<br>
> --- a/src/gallium/Android.mk<br>
> +++ b/src/gallium/Android.mk<br>
> @@ -43,7 +43,7 @@ SUBDIRS += winsys/radeon/drm drivers/r300<br>
> SUBDIRS += winsys/radeon/drm drivers/r600<br>
> SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi<br>
> SUBDIRS += winsys/vc4/drm drivers/vc4<br>
> -SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl<br>
> +SUBDIRS += winsys/virgl/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl<br>
> SUBDIRS += winsys/svga/drm drivers/svga<br>
> SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly<br>
> SUBDIRS += state_trackers/dri<br>
> diff --git a/src/gallium/drivers/virgl/Android.mk b/src/gallium/drivers/virgl/Android.mk<br>
> index 0067dfa702..a6fe53fbe9 100644<br>
> --- a/src/gallium/drivers/virgl/Android.mk<br>
> +++ b/src/gallium/drivers/virgl/Android.mk<br>
> @@ -35,5 +35,5 @@ include $(BUILD_STATIC_LIBRARY)<br>
><br>
> ifneq ($(HAVE_GALLIUM_VIRGL),)<br>
> GALLIUM_TARGET_DRIVERS += virtio_gpu<br>
> -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_virgl libmesa_winsys_virgl_vtest)<br>
> +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_virgl_common libmesa_winsys_virgl libmesa_winsys_virgl_vtest)<br>
> endif<br>
> diff --git a/src/gallium/winsys/virgl/drm/Android.mk b/src/gallium/winsys/virgl/drm/Android.mk<br>
> index 5e2500774e..398a7645bc 100644<br>
> --- a/src/gallium/winsys/virgl/drm/Android.mk<br>
> +++ b/src/gallium/winsys/virgl/drm/Android.mk<br>
> @@ -27,6 +27,8 @@ include $(CLEAR_VARS)<br>
><br>
> LOCAL_SRC_FILES := $(C_SOURCES)<br>
><br>
> +LOCAL_C_INCLUDES := $(GALLIUM_TOP)/winsys/virgl/common<br>
<br>
This should be unnecessary.<br>
The include path should be imported automatically.<br>
However, there is a typo in Android.mk of libmesa_winsys_virgl_common<br>
that prevents it from working. We should fix the typo instead of adding this.<br>
Will send a patch later.<br></blockquote><div><br></div><div>I was also thinking the LOCAL_C_INCLUDES un-necessary,</div><div>but for some reason fatal error: '*.h' file not found was happening without this</div><div><br></div><div>I double checked prior to submit the patch with the LOCAL_C_INCLUDES</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> +<br>
> LOCAL_MODULE := libmesa_winsys_virgl<br>
><br>
> LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common<br>
> diff --git a/src/gallium/winsys/virgl/vtest/Android.mk b/src/gallium/winsys/virgl/vtest/Android.mk<br>
> index 5b33f67711..6d35223c8e 100644<br>
> --- a/src/gallium/winsys/virgl/vtest/Android.mk<br>
> +++ b/src/gallium/winsys/virgl/vtest/Android.mk<br>
> @@ -27,6 +27,8 @@ include $(CLEAR_VARS)<br>
><br>
> LOCAL_SRC_FILES := $(C_SOURCES)<br>
><br>
> +LOCAL_C_INCLUDES := $(GALLIUM_TOP)/winsys/virgl/common<br>
<br>
Ditto<br></blockquote><div><br></div><div>Same comment here</div><div>The patch has been already commited to master to at least avoid the building errors</div><div><br></div><div>If you find more correct way, please submit new patch to mesa-dev</div><div>Thanks</div><div><br></div><div>Mauro</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> +<br>
> LOCAL_MODULE := libmesa_winsys_virgl_vtest<br>
><br>
> LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common<br>
> --<br>
<br>
<br>
<br>
-- <br>
Chih-Wei<br>
Android-x86 project<br>
<a href="http://www.android-x86.org" rel="noreferrer" target="_blank">http://www.android-x86.org</a><br>
</blockquote></div></div>