[Mesa-dev] [PATCH v3] i965: android: pass the correct header name to the python script

[Lionel Landwerlin]

On 20/03/18 19:34, Emil Velikov wrote:
> v2: Pass the actual filename instead of $(word ...) magic
> v3: Drop duplicate $(i965_oa_xml_FILES)
>
> Fixes: 2d2b15fbcab ("i965: fix autotools/android build
> Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> Cc: Clayton Craft <clayton.a.craft at intel.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>   src/mesa/drivers/dri/i965/Android.mk | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
> index 8c4a613bcf3..a1738a8afa2 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -315,7 +315,7 @@ i965_oa_xml_FILES := $(addprefix $(LOCAL_PATH)/, \
>   $(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=$(intermediates)/brw_oa_metrics.h $(i965_oa_xml_FILES)

Don't we need the srcdir trick here too?
It seems to be the problem on android too.

>   
>   $(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c
>