[Mesa-dev] [PATCH] android: add libmesa_util include path to MESA_DRI_C_INCLUDES

[Tapani Pälli]

On 08/01/2017 02:04 PM, Eric Engestrom wrote:
> On Tuesday, 2017-08-01 10:51:54 +0300, Tapani Pälli wrote:
>> It is required by libmesa_dri_common and i965_dri modules which both
>> already use MESA_DRI_C_INCLUDES. Fixes following build errors:
>>
>> In file included from vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/common/dri_util.c:45:
>> vendor/intel/external/android_ia/mesa/src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found
>> ---
> 
> Careful if you `git am` this patch, the above line will drop everything below.


That is true. I've sent another proposal here:
https://lists.freedesktop.org/archives/mesa-dev/2017-August/164985.html

>> In file included from vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/intel_screen.c:44:
>> vendor/intel/external/android_ia/mesa/src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found
>>
>> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
>> ---
>>   src/mesa/drivers/dri/Android.mk | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
>> index 53ff4b4..9314479 100644
>> --- a/src/mesa/drivers/dri/Android.mk
>> +++ b/src/mesa/drivers/dri/Android.mk
>> @@ -33,6 +33,7 @@ MESA_DRI_CFLAGS := \
>>   
>>   MESA_DRI_C_INCLUDES := \
>>   	$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
>> +	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_util,,) \
>>   	$(MESA_TOP)/src/gallium/include \
>>   	$(MESA_TOP)/src/gallium/auxiliary \
>>   	external/expat/lib
>> -- 
>> 2.9.4
>>