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

[Chih-Wei Huang]

2017-08-01 15:51 GMT+08:00 Tapani Pälli <tapani.palli at intel.com>:
> 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
> ---
> 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

What commit caused the errors?

> 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,,) \

It would be better to export the include path
from libmesa_util.

>         $(MESA_TOP)/src/gallium/include \
>         $(MESA_TOP)/src/gallium/auxiliary \
>         external/expat/lib
> --

-- 
Chih-Wei
Android-x86 project
http://www.android-x86.org