ilo: fold drm_intel_get_aperture_sizes() within probe_winsys()

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

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 4e5acc86f07024b03ec536527b254b6f8df2cf21..bf99e4fb66584a74845b851156f00b373f0e83c4 100644 (file)
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -26,14 +26,20 @@
 GALLIUM_TOP := $(call my-dir)
 GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk
 
-SUBDIRS := \
-       targets/egl-static \
-       state_trackers/egl \
-       auxiliary
+SUBDIRS := auxiliary
+
+#
+# Gallium drivers and their respective winsys
+#
 
 # swrast
 SUBDIRS += winsys/sw/android drivers/softpipe
 
+# freedreno
+ifneq ($(filter freedreno, $(MESA_GPU_DRIVERS)),)
+SUBDIRS += winsys/freedreno/drm drivers/freedreno
+endif
+
 # i915g
 ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += winsys/i915/drm drivers/i915
@@ -48,10 +54,7 @@ endif
 ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += \
        winsys/nouveau/drm \
-       drivers/nouveau \
-       drivers/nvfx \
-       drivers/nv50 \
-       drivers/nvc0
+       drivers/nouveau
 endif
 
 # r300g/r600g/radeonsi
@@ -60,6 +63,8 @@ SUBDIRS += winsys/radeon/drm
 ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += drivers/r300
 endif
+ifneq ($(filter r600g radeonsi, $(MESA_GPU_DRIVERS)),)
+SUBDIRS += drivers/radeon
 ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += drivers/r600
 endif
@@ -67,11 +72,17 @@ ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += drivers/radeonsi
 endif
 endif
+endif
 
 # vmwgfx
 ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += winsys/svga/drm drivers/svga
 endif
 
+#
+# Gallium state trackers and their users (targets)
+#
+SUBDIRS += state_trackers/egl targets/egl-static
+
 mkfiles := $(patsubst %,$(GALLIUM_TOP)/%/Android.mk,$(SUBDIRS))
 include $(mkfiles)