2016-04-16 1:21 GMT+08:00 Emil Velikov <emil.l.veli...@gmail.com>: > On 14 April 2016 at 20:40, Rob Herring <r...@kernel.org> wrote: >> Commit 4db8f15a2576 ("glsl: move the android build scripts a level up") >> dropped a generated include path for glcpp. Add it back adjusting for the >> new location. >> >> Cc: Emil Velikov <emil.veli...@collabora.com> >> Signed-off-by: Rob Herring <r...@kernel.org> >> --- >> src/compiler/Android.glsl.gen.mk | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/src/compiler/Android.glsl.gen.mk >> b/src/compiler/Android.glsl.gen.mk >> index b0df8a1..b2ea12c 100644 >> --- a/src/compiler/Android.glsl.gen.mk >> +++ b/src/compiler/Android.glsl.gen.mk >> @@ -33,6 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) >> >> LOCAL_C_INCLUDES += \ >> $(intermediates)/glsl \ >> + $(intermediates)/glsl/glcpp \ > Strange neither Autotools nor Scons needs this. What is the (somewhat) > absolute path of the glcpp and glsl files (both generated and > distribution).
Probably they are generated in the same source dir? Android generates these files in the $(intermediates) dir. Without the patch we got external/mesa/src/compiler/glsl/glcpp/glcpp-lex.l:30:25: fatal error: glcpp-parse.h: No such file or directory #include "glcpp-parse.h" ^ compilation terminated. make: *** [out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/glcpp/glcpp-lex.o] Error 1 The series of patches are Tested-by: Chih-Wei Huang <cwhu...@linux.org.tw> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev