Mesa (master): android: radeonsi: add nir include paths

[Emil Velikov]

Module: Mesa
Branch: master
Commit: f99a733e3892750402db7b3e9dfb306d3bbff851
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f99a733e3892750402db7b3e9dfb306d3bbff851

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Thu Aug  3 02:55:46 2017 +0200

android: radeonsi: add nir include paths

Android build changes to avoid the following building error:

target  C: libmesa_pipe_radeonsi <= external/mesa/src/gallium/drivers/radeonsi/si_pipe.c
...
In file included from external/mesa/src/gallium/drivers/radeonsi/si_pipe.c:38:
external/mesa/src/compiler/nir/nir.h:48:10: fatal error: 'nir_opcodes.h' file not found
         ^
1 error generated.

Fixes: da62a31c5b "radeonsi: add nir include paths"
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/gallium/drivers/radeonsi/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk
index 4a5df5b01d..65661a5ea7 100644
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -36,7 +36,8 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/amd/common \
-	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \
+	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir
 
 LOCAL_STATIC_LIBRARIES := libmesa_amd_common