X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FAndroid.mk;h=78e821581b96df3072f45534db53f72b1cb3f7ad;hb=0ac84fceb401f513ef8c49bdf05e34419220e5c8;hp=7c6bda68d59f8183a997fd2242c62f530bb308f0;hpb=2a2dabe1c330fea311505b453de58ddcd5488fcc;p=mesa.git

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 7c6bda68d59..78e821581b9 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -25,6 +25,7 @@
 
 GALLIUM_TOP := $(call my-dir)
 GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk
+GALLIUM_TARGET_DRIVERS :=
 
 SUBDIRS := auxiliary
 SUBDIRS += auxiliary/pipe-loader
@@ -33,16 +34,26 @@ SUBDIRS += auxiliary/pipe-loader
 # Gallium drivers and their respective winsys
 #
 
-SUBDIRS += winsys/sw/dri drivers/softpipe
+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 += drivers/r300 drivers/r600 drivers/radeon drivers/radeonsi
-SUBDIRS += winsys/amdgpu/drm winsys/radeon/drm
+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/drm winsys/virgl/vtest drivers/virgl
+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 += frontends/dri
+SUBDIRS += winsys/iris/drm drivers/iris
+SUBDIRS += winsys/lima/drm drivers/lima
+SUBDIRS += winsys/panfrost/drm drivers/panfrost
 
-SUBDIRS += state_trackers/dri targets/dri
+# 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)
 
-include $(call all-named-subdir-makefiles,$(SUBDIRS))
+include $(INC_DIRS)