[Mesa-dev] [android-x86-devel] [PATCH 4/5] android: fix building with new glsl, nir, compiler libraries

[Mauro Rossi]

Hi,

Just to close this thread,
I've checked on both marshamallow-x86 and kitkat-x86 builds and the line

$(MESA_TOP)/src/glsl

which is now a non-existent path, is not needed anymore and can be removed
in LOCAL_C_INCLUDES for all the following android makefiles:

./src/mesa/Android.libmesa_glsl_utils.mk
./src/mesa/Android.libmesa_st_mesa.mk
./src/mesa/program/Android.mk
./src/mesa/Android.mesa_gen_matypes.mk
./src/gallium/drivers/r300/Android.mk

My doubt was that the new correct path $(MESA_TOP)/src/compiler/glsl had to
be included,
but I've checked and, without new glsl path, it builds just fine with both
marshmallow-x86 and with kitkat-x86.

My doubt was related to the different treatment wrt automatic header
picking, that has different behavior in L/M compared to kitkat.
I just wanted to be sure

Mauro

PS: There is a different building error appeared this week, but I'll submit
a separate patch, if needed, in the next days

$(MESA_TOP)/src/mesa/main path is needed in LOCAL_C_INCLUDES of
./src/mesa/program/Android.mk
to avoid the following building error:

external/mesa/src/mesa/program/prog_statevars.c:43:25: fatal error:
framebuffer.h: No such file or directory
compilation terminated.
build/core/binary.mk:512: recipe for target
'out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_program_intermediates/prog_statevars.o'
failed
make: ***
[out/target/product/x86/obj/STATIC_LIBRARIES/libmesa_program_intermediates/prog_statevars.o]
Error 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160207/80f53741/attachment.html>