Hi Chih-Wei,
On Mon, Jun 24, 2019 at 7:26 AM Chih-Wei Huang <cwhu...@android-x86.org>
wrote:
> Mauro Rossi <issor.or...@gmail.com> 於 2019年6月22日 週六 上午2:06寫道：
> >
> > Changelog in Android makefile:
> > - Add LOCAL_MODULE_CLASS, intermediates and LOCAL_GENERATED_SOURCES
> > - Use LOCAL_EXPORT_C_INCLUDE_DIRS to export $(intermediates) path
> > - Move generated header rules before 'include $(BUILD_STATIC_LIBRARY)'
> >
> > Fixes the following building error:
> >
> > In file included from external/mesa/src/gallium/targets/dri/target.c:1:
> > external/mesa/src/gallium/auxiliary/target-helpers/drm_helper.h:257:16:
> > fatal error: 'virgl/virgl_driinfo.h' file not found
> > #include "virgl/virgl_driinfo.h"
> > ^~~~~~~~~~~~~~~~~~~~~~~
> > 1 error generated.
> >
> > Fixes: cf800998a ("virgl: Add driinfo file and tie it into the build")
> > Signed-off-by: Mauro Rossi <issor.or...@gmail.com>
> > ---
> > src/gallium/drivers/virgl/Android.mk | 10 ++++++++--
> > 1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/gallium/drivers/virgl/Android.mk
> b/src/gallium/drivers/virgl/Android.mk
> > index f77bcf196e..585ed7b2ce 100644
> > --- a/src/gallium/drivers/virgl/Android.mk
> > +++ b/src/gallium/drivers/virgl/Android.mk
> > @@ -30,8 +30,9 @@ LOCAL_SRC_FILES := \
> >
> > LOCAL_MODULE := libmesa_pipe_virgl
> >
> > -include $(GALLIUM_COMMON_MK)
> > -include $(BUILD_STATIC_LIBRARY)
> > +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> > +intermediates := $(call local-generated-sources-dir)
> > +LOCAL_GENERATED_SOURCES += $(intermediates)/virgl/virgl_driinfo.h
> >
> > GEN_DRIINFO_INPUTS := \
> > $(MESA_TOP)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
> > @@ -44,6 +45,11 @@ $(intermediates)/virgl/virgl_driinfo.h:
> $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
> > @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
> > $(hide) $(MESA_PYTHON2) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) >
> $@ || ($(RM) $@; false)
> >
> > +LOCAL_EXPORT_C_INCLUDE_DIRS += $(intermediates)
> > +
> > +include $(GALLIUM_COMMON_MK)
> > +include $(BUILD_STATIC_LIBRARY)
> > +
> > ifneq ($(HAVE_GALLIUM_VIRGL),)
> > GALLIUM_TARGET_DRIVERS += virtio_gpu
> > $(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_virgl_common
> libmesa_winsys_virgl libmesa_winsys_virgl_vtest)
> > --
>
> I suggest to use := instead of += in
> LOCAL_GENERATED_SOURCES and LOCAL_EXPORT_C_INCLUDE_DIRS
> since they don't catenate others.
>
Thanks a lot, I did not know that, I will correct in the final version.
> Except that, the patch looks good to me.
>
> Review-by: Chih-Wei Huang <cwhu...@linux.org.tw>
>
Thanks for the review
Mauro
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
