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

[Lionel Landwerlin]

Thanks Mark,

There is one thing I cannot explain why Emil's patch :

How comes it is :

--code=out/target/product/androidia_64/gen/SHARED_LIBRARIES/i965_dri_intermediates/brw_oa_metrics.c

Yet :

--header=out/target/common/obj/PACKAGING/boot-jars-package-check_intermediates/brw_oa_metrics.h 


Those paths should be the same no?

Unless what we want is :

--header=$(dir $@)/brw_oa_metrics.h

On 20/03/18 21:39, Mark Janes wrote:
> I tested this, and still got an error:
>
> FAILED: out/target/product/androidia_64/gen/SHARED_LIBRARIES/i965_dri_intermediates/brw_oa_metrics.c
> /bin/bash -c "python vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa.py --code=out/target/product/androidia_64/gen/SHARED_LIBRARIES/i965_dri_intermediates/brw_oa_metrics.c --header=out/target/common/obj/PACKAGING/boot-jars-package-check_intermediates/brw_oa_metrics.h vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_hsw.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_bdw.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_chv.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_sklgt2.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_sklgt3.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_sklgt4.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_bxt.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_kblgt2.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_kblgt3.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_glk.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa_cflgt3.xml"
> Traceback (most recent call last):
>    File "vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa.py", line 734, in <module>
>      main()
>    File "vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/brw_oa.py", line 561, in main
>      header_file = open(args.header, 'w')
> IOError: [Errno 2] No such file or directory: 'out/target/common/obj/PACKAGING/boot-jars-package-check_intermediates/brw_oa_metrics.h'
>
> Emil Velikov <emil.l.velikov at gmail.com> writes:
>
>> 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)
>>   
>>   $(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c
>>   
>> -- 
>> 2.16.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev