On 21 March 2018 at 07:15, Tapani Pälli <tapani.pa...@intel.com> wrote:
> From: Lionel Landwerlin <lionel.g.landwer...@intel.com>
>
> This is the equivalent of commit 5770e1d89e0eb49eb3c9547e8657d636b6e7e5d7 for
> android.
>
> v2: fix xml files path and file given to --header
>
> Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
> Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
> Fixes: 2d2b15fbcab ("i965: fix autotools/android build")
> ---
> src/mesa/drivers/dri/i965/Android.mk | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/Android.mk
> b/src/mesa/drivers/dri/i965/Android.mk
> index 8c4a613bcf..324d087220 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -309,13 +309,16 @@ intermediates := $(call local-generated-sources-dir)
> LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
> $(i965_oa_GENERATED_FILES))
>
> -i965_oa_xml_FILES := $(addprefix $(LOCAL_PATH)/, \
> +i965_oa_xml_FILES := $(addprefix $(MESA_TOP)/src/mesa/drivers/dri/i965/, \
> $(i965_oa_xml_FILES))
>
IIRC := will result in the list being evaluated on assignment. Hence
the problem with LOCAL_PATH being something else (while generating the
files) won't exist.
The output listed in [1] confirms that.
> $(intermediates)/brw_oa_metrics.c: $(LOCAL_PATH)/brw_oa.py
> $(i965_oa_xml_FILES)
> @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
> @mkdir -p $(dir $@)
> - $(hide) $(MESA_PYTHON2) $< --code=$@ $(i965_oa_xml_FILES) --header=$@
> $(i965_oa_xml_FILES)
> + $(hide) $(MESA_PYTHON2) $< \
> + --code=$@ \
> + --header=$(call
> generated-sources-dir-for,SHARED_LIBRARIES,i965_dri,,)/brw_oa_metrics.h \
Unlike above - using intermediates for the header (as my patch did)
doesn't cut it.
Personally I'd keep the i965_oa_xml_FILES as-is, but regardless - the patch is
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
-Emil
[1] https://bugs.freedesktop.org/show_bug.cgi?id=105634
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
