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/mesa/drivers/dri/i915/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/dri/i915') diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index 741ea260e94..b95d5c1a3a5 100644 --- a/src/mesa/drivers/dri/i915/Android.mk +++ b/src/mesa/drivers/dri/i915/Android.mk @@ -54,7 +54,8 @@ LOCAL_SHARED_LIBRARIES := \ libdrm_intel LOCAL_GENERATED_SOURCES := \ - $(MESA_DRI_OPTIONS_H) + $(MESA_DRI_OPTIONS_H) \ + $(MESA_GEN_NIR_H) include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3