[Mesa-dev] [PATCH] android: fix LOCAL_C_INCLUDES to find glsl_types.h

[Emil Velikov]

Hi Mauro

On 6 November 2015 at 03:31, Mauro Rossi <issor.oruam at gmail.com> wrote:
> These changes are necessary to avoid building errors in glsl and i965
> ---
>  src/glsl/Android.mk                  | 6 ++++--
>  src/mesa/drivers/dri/i965/Android.mk | 3 ++-
>  2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
> index f63b7da..6902ea4 100644
> --- a/src/glsl/Android.mk
> +++ b/src/glsl/Android.mk
> @@ -42,7 +42,8 @@ LOCAL_C_INCLUDES := \
>         $(MESA_TOP)/src/mapi \
>         $(MESA_TOP)/src/mesa \
>         $(MESA_TOP)/src/gallium/include \
> -       $(MESA_TOP)/src/gallium/auxiliary
> +       $(MESA_TOP)/src/gallium/auxiliary \
> +       $(MESA_TOP)/src/glsl/nir
>
>  LOCAL_MODULE := libmesa_glsl
>
> @@ -63,7 +64,8 @@ LOCAL_C_INCLUDES := \
>         $(MESA_TOP)/src/mapi \
>         $(MESA_TOP)/src/mesa \
>         $(MESA_TOP)/src/gallium/include \
> -       $(MESA_TOP)/src/gallium/auxiliary
> +       $(MESA_TOP)/src/gallium/auxiliary \
> +       $(MESA_TOP)/src/glsl/nir
>
>  LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util
>
> diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
> index d30a053..f9a914a 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -45,7 +45,8 @@ LOCAL_CFLAGS += \
>  endif
>
>  LOCAL_C_INCLUDES := \
> -       $(MESA_DRI_C_INCLUDES)
> +       $(MESA_DRI_C_INCLUDES) \
> +       $(MESA_TOP)/src/glsl/nir
>
>  LOCAL_SRC_FILES := \
>         $(i965_compiler_FILES) \

Following the Android way of exporting includes I believe you want the following

diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk
index 6898fb0..59cc857 100644
--- a/src/glsl/Android.gen.mk
+++ b/src/glsl/Android.gen.mk
@@ -38,7 +38,8 @@ LOCAL_C_INCLUDES += \
  $(MESA_TOP)/src/glsl/nir

 LOCAL_EXPORT_C_INCLUDE_DIRS += \
- $(intermediates)/nir
+ $(intermediates)/nir \
+ $(MESA_TOP)/src/glsl/nir

 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
  $(LIBGLCPP_GENERATED_FILES) \


Formatting might be broken (thanks gmail), although the gist is there.
Can you give it a try (note the order is important)

Thanks
Emil