summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri/Android.mk
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2016-02-10 16:02:11 -0600
committerEmil Velikov <[email protected]>2016-02-29 10:51:44 +0000
commit574a92b048ae2b482982c3f156182970d551ca94 (patch)
treee42747ca8701dcae159986c0235a3808c6d413c7 /src/gallium/targets/dri/Android.mk
parenta640ad15e1fff3eb51f42bf30c31eafe02a921e2 (diff)
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" <[email protected]> Cc: Mauro Rossi <[email protected]> Signed-off-by: Rob Herring <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri/Android.mk')
-rw-r--r--src/gallium/targets/dri/Android.mk2
1 files changed, 2 insertions, 0 deletions
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 \