gallium: s/PIPE_CAP_TIMER_QUERY/PIPE_CAP_QUERY_TIME_ELAPSED/

[mesa.git] / src / gallium / Android.mk

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 4d303d81e6eb9da34a6455beaf976760b45a31c6..1d002d05374a7984ac4e5cd132f62f1c6a26a54a 100644 (file)
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -39,10 +39,28 @@ ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += winsys/i915/drm drivers/i915
 endif
 
-# r600g
-ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
+# nouveau
+ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
+SUBDIRS += \
+       winsys/nouveau/drm \
+       drivers/nouveau \
+       drivers/nvfx \
+       drivers/nv50 \
+       drivers/nvc0
+endif
+
+# r300g/r600g/radeonsi
+ifneq ($(filter r300g r600g radeonsi, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += winsys/radeon/drm
-SUBDIRS += winsys/r600/drm drivers/r600
+ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
+SUBDIRS += drivers/r300
+endif
+ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
+SUBDIRS += drivers/r600
+endif
+ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),)
+SUBDIRS += drivers/radeonsi
+endif
 endif
 
 # vmwgfx