X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FAndroid.mk;h=59ee0e0f68b6e479cadbd5d52310d36c9c70a611;hb=9d9a2819ee0e862f60abf50ba239a341b664845a;hp=d2697c5ca6bdae2456e269bc7bf6f3f7db78c74a;hpb=15576344f706a8ec850bdfcfa005917a7a7597df;p=mesa.git

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index d2697c5ca6b..59ee0e0f68b 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -25,14 +25,35 @@
 
 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
+#
+# Gallium drivers and their respective winsys
+#
+
+SUBDIRS += winsys/sw/kms-dri 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/kmsro/drm drivers/kmsro
+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/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl
+SUBDIRS += winsys/svga/drm drivers/svga
+SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
+SUBDIRS += state_trackers/dri
+SUBDIRS += winsys/iris/drm drivers/iris
+SUBDIRS += winsys/lima/drm drivers/lima
+SUBDIRS += winsys/panfrost/drm drivers/panfrost
+
+# 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)