diff options
| author | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
| commit | a62edcce4eb4c800d972817a20ee874bf2a2c3ef (patch) | |
| tree | 46083a8762d45a6c595c7aaee2bb1cd0fc36eb62 /src/gallium/Android.mk | |
| parent | 9b9f973ca6d3cc1ec5be27857def00a83c032464 (diff) | |
| parent | 6844d6b7f8398a25eff511541b187afeb1199ce0 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/gallium/Android.mk')
| -rw-r--r-- | src/gallium/Android.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index b2662ffca8c..b946681840c 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -33,7 +33,9 @@ SUBDIRS := auxiliary # # swrast -SUBDIRS += winsys/sw/android drivers/softpipe +ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) +SUBDIRS += winsys/sw/dri winsys/sw/kms-dri drivers/softpipe +endif # freedreno ifneq ($(filter freedreno, $(MESA_GPU_DRIVERS)),) @@ -74,10 +76,17 @@ endif endif endif +# vc4 +ifneq ($(filter vc4, $(MESA_GPU_DRIVERS)),) +SUBDIRS += winsys/vc4/drm drivers/vc4 +endif + # vmwgfx ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/svga/drm drivers/svga endif -mkfiles := $(patsubst %,$(GALLIUM_TOP)/%/Android.mk,$(SUBDIRS)) -include $(mkfiles) +# Gallium state trackers and target for dri +SUBDIRS += state_trackers/dri targets/dri + +include $(call all-named-subdir-makefiles,$(SUBDIRS)) |