Android: fix build break from nir/glsl move to compiler/
authorRob Herring <robh@kernel.org>
Wed, 10 Feb 2016 22:02:11 +0000 (16:02 -0600)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 29 Feb 2016 10:51:44 +0000 (10:51 +0000)
commit574a92b048ae2b482982c3f156182970d551ca94
treee42747ca8701dcae159986c0235a3808c6d413c7
parenta640ad15e1fff3eb51f42bf30c31eafe02a921e2
Android: fix build break from nir/glsl move to compiler/

Commits a39a8fbbaa12 ("nir: move to compiler/") and eb63640c1d38
("glsl: move to compiler/") broke Android builds. Fix them.

There is also a missing dependency between generated NIR headers and
several libraries. This isn't a new issue, but seems to have been
exposed by the NIR move.

Built with i915, i965, freedreno, r300g, r600g, vc4, and virgl enabled.

Cc: "11.2" <mesa-stable@lists.freedesktop.org>
Cc: Mauro Rossi <issor.oruam@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
17 files changed:
Android.mk
src/compiler/Android.gen.mk
src/compiler/glsl/Android.gen.mk
src/compiler/glsl/Android.mk
src/gallium/auxiliary/Android.mk
src/gallium/drivers/freedreno/Android.mk
src/gallium/drivers/r300/Android.mk
src/gallium/drivers/vc4/Android.mk
src/gallium/targets/dri/Android.mk
src/mesa/Android.libmesa_dricore.mk
src/mesa/Android.libmesa_glsl_utils.mk
src/mesa/Android.libmesa_st_mesa.mk
src/mesa/Android.mesa_gen_matypes.mk
src/mesa/drivers/dri/Android.mk
src/mesa/drivers/dri/i915/Android.mk
src/mesa/drivers/dri/i965/Android.mk
src/mesa/program/Android.mk