From 574a92b048ae2b482982c3f156182970d551ca94 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 10 Feb 2016 16:02:11 -0600 Subject: 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" Cc: Mauro Rossi Signed-off-by: Rob Herring Reviewed-by: Emil Velikov --- src/gallium/targets/dri/Android.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gallium/targets/dri/Android.mk') diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 2a7738e6979..4acd093f784 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -109,6 +109,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_st_dri \ libmesa_st_mesa \ libmesa_glsl \ + libmesa_compiler \ + libmesa_nir \ libmesa_dri_common \ libmesa_megadriver_stub \ libmesa_gallium \ -- cgit v1.2.3