[Mesa-dev] [PATCH v2] i965: fix android build

[Lionel Landwerlin]

If it works for you & the CI, go for it.
I only tested my patch on the CI.

Thanks!

-
Lionel

On 21/03/18 07:32, Tapani Pälli wrote:
> When sending this I did not realize there are also other patches in 
> list ... hopefully this makes sense. Anyway, this fixes issues for me 
> and build is fine on Android.
>
> On 21.03.2018 09:15, Tapani Pälli wrote:
>> From: Lionel Landwerlin <lionel.g.landwerlin at 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.landwerlin at intel.com>
>> Signed-off-by: Tapani Pälli <tapani.palli at 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))
>>     $(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 
>> \
>> +    $(i965_oa_xml_FILES)
>>     $(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c
>>
>