X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FAndroid.mk;h=c5f31ef0ac670a071a44922a77e1e6d5eb35c0f9;hb=b225cdceccb225329298763baa302a9332288b18;hp=b49a61b1ffd4ddc93c06000d8cf5947a71045860;hpb=7b1972d7be8ed68676786288ac2d77b8d71d113d;p=mesa.git

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index b49a61b1ffd..c5f31ef0ac6 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -25,20 +25,33 @@
 
 GALLIUM_TOP := $(call my-dir)
 GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk
+GALLIUM_TARGET_DRIVERS :=
 
-SUBDIRS := \
-	targets/egl-static \
-	state_trackers/egl \
-	auxiliary
+SUBDIRS := auxiliary
+SUBDIRS += auxiliary/pipe-loader
 
-# swrast
-SUBDIRS += winsys/sw/android drivers/softpipe
+#
+# Gallium drivers and their respective winsys
+#
+
+SUBDIRS += winsys/sw/dri drivers/softpipe
+SUBDIRS += winsys/freedreno/drm drivers/freedreno
+SUBDIRS += winsys/i915/drm drivers/i915
+SUBDIRS += winsys/nouveau/drm drivers/nouveau
+SUBDIRS += winsys/pl111/drm drivers/pl111
+SUBDIRS += winsys/radeon/drm drivers/r300
+SUBDIRS += winsys/radeon/drm drivers/r600
+SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi
+SUBDIRS += winsys/vc4/drm drivers/vc4
+SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl
+SUBDIRS += winsys/svga/drm drivers/svga
+SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
+SUBDIRS += winsys/imx/drm
+SUBDIRS += state_trackers/dri
 
-# r600g
-ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
-SUBDIRS += winsys/radeon/drm
-SUBDIRS += winsys/r600/drm drivers/r600
-endif
+# sort to eliminate any duplicates
+INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS)))
+# targets/dri must be included last
+INC_DIRS += $(call all-named-subdir-makefiles,targets/dri)
 
-mkfiles := $(patsubst %,$(GALLIUM_TOP)/%/Android.mk,$(SUBDIRS))
-include $(mkfiles)
+include $(INC_DIRS)