<div dir="ltr">Update2: I'm getting the building error in both x86 target and x86_64 target.<div><br><div>I'm relieved it's not arch dependend, I suspect that export will require a dependency to be declared,</div><div> because if i965_dri module is built before glsl ones we will have the error.</div><div><br></div><div>The LOCAL_C_INCLUDES even if not elegant, avoided the problem in the first place, </div><div>but I'd like to learn the by the best practice and apply it in the future.<br><div><br></div><div>Emil, Chih-Wei what is your thought on this?</div><div>Added also other android-x86 developers in CC</div><div><br></div><div>Mauro</div><div><br></div><div><br><div><div><font face="monospace, monospace">In file included from external/mesa/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp:34:0:</font></div><div><font face="monospace, monospace">external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory</font></div><div><font face="monospace, monospace"> #include "glsl_types.h"</font></div><div><font face="monospace, monospace"> ^</font></div><div><font face="monospace, monospace">compilation terminated.</font></div><div><font face="monospace, monospace">build/core/<a href="http://binary.mk:620">binary.mk:620</a>: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cubemap_normalize.o' failed</font></div><div><font face="monospace, monospace">make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cubemap_normalize.o] Error 1</font></div><div><font face="monospace, monospace">make: *** Waiting for unfinished jobs....</font></div><div><font face="monospace, monospace">target C++: i965_dri <= external/mesa/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp</font></div><div><font face="monospace, monospace">In file included from external/mesa/src/mesa/drivers/dri/i965/brw_shader.h:29:0,</font></div><div><font face="monospace, monospace"> from external/mesa/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp:29:</font></div><div><font face="monospace, monospace">external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory</font></div><div><font face="monospace, monospace"> #include "glsl_types.h"</font></div><div><font face="monospace, monospace"> ^</font></div><div><font face="monospace, monospace">compilation terminated.</font></div><div><font face="monospace, monospace">In file included from external/mesa/src/mesa/drivers/dri/i965/brw_shader.h:29:0,</font></div><div><font face="monospace, monospace"> from external/mesa/src/mesa/drivers/dri/i965/brw_cfg.h:32,</font></div><div><font face="monospace, monospace"> from external/mesa/src/mesa/drivers/dri/i965/brw_cfg.cpp:28:</font></div><div><font face="monospace, monospace">external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory</font></div><div><font face="monospace, monospace"> #include "glsl_types.h"</font></div><div><font face="monospace, monospace"> ^</font></div><div><font face="monospace, monospace">compilation terminated.</font></div><div><font face="monospace, monospace">build/core/<a href="http://binary.mk:620">binary.mk:620</a>: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_dead_control_flow.o' failed</font></div><div><font face="monospace, monospace">make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_dead_control_flow.o] Error 1</font></div><div><font face="monospace, monospace">build/core/<a href="http://binary.mk:620">binary.mk:620</a>: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cfg.o' failed</font></div><div><font face="monospace, monospace">make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_cfg.o] Error 1</font></div><div><font face="monospace, monospace">In file included from external/mesa/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp:46:0:</font></div><div><font face="monospace, monospace">external/mesa/src/glsl/ir.h:33:24: fatal error: glsl_types.h: No such file or directory</font></div><div><font face="monospace, monospace"> #include "glsl_types.h"</font></div><div><font face="monospace, monospace"> ^</font></div><div><font face="monospace, monospace">compilation terminated.</font></div><div><font face="monospace, monospace">build/core/<a href="http://binary.mk:620">binary.mk:620</a>: recipe for target 'out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_fs_channel_expressions.o' failed</font></div><div><font face="monospace, monospace">make: *** [out/target/product/x86/obj/SHARED_LIBRARIES/i965_dri_intermediates/brw_fs_channel_expressions.o] Error 1</font></div></div></div></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">2015-11-08 13:36 GMT+01:00 Mauro Rossi <span dir="ltr"><<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi,<div><br></div><div>Sending an update because with the export android_x86 target builds ok,<div>but I'm getting again the "glsl_types.h not found" building error with android_x86_64 target (specifically for 64 bit modules).<br></div></div><div><br></div><div>I'll report as soon I may be able to understand what's going on,</div><div>added other android-x86 developers in CC.</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>Mauro</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">2015-11-07 1:29 GMT+01:00 Mauro Rossi <span dir="ltr"><<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi Emil,<div><br></div><div>by exporting the path of glsl nir headers, mesa builds without problems.</div><div><br></div><div>You can find in the attachment the formatted patch.</div><div>Thanks<span><font color="#888888"><br></font></span></div><span><font color="#888888"><div><br></div><div>Mauro</div><div><br></div><div><br></div></font></span></div><div><div><div class="gmail_extra"><br><div class="gmail_quote">2015-11-06 18:26 GMT+01:00 Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Mauro<br> <div><div><br> On 6 November 2015 at 03:31, Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>> wrote:<br> > These changes are necessary to avoid building errors in glsl and i965<br> > ---<br> > src/glsl/Android.mk | 6 ++++--<br> > src/mesa/drivers/dri/i965/Android.mk | 3 ++-<br> > 2 files changed, 6 insertions(+), 3 deletions(-)<br> ><br> > diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk<br> > index f63b7da..6902ea4 100644<br> > --- a/src/glsl/Android.mk<br> > +++ b/src/glsl/Android.mk<br> > @@ -42,7 +42,8 @@ LOCAL_C_INCLUDES := \<br> > $(MESA_TOP)/src/mapi \<br> > $(MESA_TOP)/src/mesa \<br> > $(MESA_TOP)/src/gallium/include \<br> > - $(MESA_TOP)/src/gallium/auxiliary<br> > + $(MESA_TOP)/src/gallium/auxiliary \<br> > + $(MESA_TOP)/src/glsl/nir<br> ><br> > LOCAL_MODULE := libmesa_glsl<br> ><br> > @@ -63,7 +64,8 @@ LOCAL_C_INCLUDES := \<br> > $(MESA_TOP)/src/mapi \<br> > $(MESA_TOP)/src/mesa \<br> > $(MESA_TOP)/src/gallium/include \<br> > - $(MESA_TOP)/src/gallium/auxiliary<br> > + $(MESA_TOP)/src/gallium/auxiliary \<br> > + $(MESA_TOP)/src/glsl/nir<br> ><br> > LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util<br> ><br> > diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk<br> > index d30a053..f9a914a 100644<br> > --- a/src/mesa/drivers/dri/i965/Android.mk<br> > +++ b/src/mesa/drivers/dri/i965/Android.mk<br> > @@ -45,7 +45,8 @@ LOCAL_CFLAGS += \<br> > endif<br> ><br> > LOCAL_C_INCLUDES := \<br> > - $(MESA_DRI_C_INCLUDES)<br> > + $(MESA_DRI_C_INCLUDES) \<br> > + $(MESA_TOP)/src/glsl/nir<br> ><br> > LOCAL_SRC_FILES := \<br> > $(i965_compiler_FILES) \<br> <br> </div></div>Following the Android way of exporting includes I believe you want the following<br> <br> diff --git a/src/glsl/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> b/src/glsl/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a><br> index 6898fb0..59cc857 100644<br> --- a/src/glsl/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a><br> +++ b/src/glsl/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a><br> @@ -38,7 +38,8 @@ LOCAL_C_INCLUDES += \<br> $(MESA_TOP)/src/glsl/nir<br> <br> LOCAL_EXPORT_C_INCLUDE_DIRS += \<br> - $(intermediates)/nir<br> + $(intermediates)/nir \<br> + $(MESA_TOP)/src/glsl/nir<br> <br> LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \<br> $(LIBGLCPP_GENERATED_FILES) \<br> <br> <br> Formatting might be broken (thanks gmail), although the gist is there.<br> Can you give it a try (note the order is important)<br> <br> Thanks<br> <span><font color="#888888">Emil<br> </font></span></blockquote></div><br></div> </div></div></blockquote></div><br></div> </div></div></blockquote></div><br></div>