Android: fix build break from nir/glsl move to compiler/

Commits a39a8fbbaa ("nir: move to compiler/") and eb63640c1d
("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>

This commit is contained in:

Rob Herring

2016-02-10 16:02:11 -06:00

committed by

Emil Velikov

parent a640ad15e1

commit 574a92b048

17 changed files with 30 additions and 20 deletions

									
										2

Android.mk
									
												View File
												
				@@ -87,7 +87,7 @@ SUBDIRS := \

					src/loader \

					src/mapi \

					src/compiler \

					src/glsl \

					src/compiler/glsl \

					src/mesa \

					src/util \

					src/egl \

Android: fix build break from nir/glsl move to compiler/

2 Android.mk Unescape Escape View File

2

Android.mk

View File