diff options
| author | Rob Herring <robh@kernel.org> | 2017-05-03 14:35:19 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-05-11 13:52:21 +0100 |
| commit | 2a2dabe1c330fea311505b453de58ddcd5488fcc (patch) | |
| tree | 51ac113eaebc1a4957fba2c284a23c27e46a1514 /src/gallium | |
| parent | 88014bc0237ecba69a8a7c1e0f7094644e32c8a9 (diff) | |
Android: remove needless conditional including of child makefiles
It is not necessary to filter driver and winsys directories based on the
list of enabled drivers. Selecting the included driver libraries or not is
sufficient to control what is built.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/Android.mk | 52 |
1 files changed, 3 insertions, 49 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index e67cfab5b31..7c6bda68d59 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -33,62 +33,16 @@ SUBDIRS += auxiliary/pipe-loader # Gallium drivers and their respective winsys # -# swrast -ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/sw/dri drivers/softpipe -endif - -# 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 -endif - -# nouveau -ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),) -SUBDIRS += \ - winsys/nouveau/drm \ - drivers/nouveau -endif - -# r300g/r600g/radeonsi -ifneq ($(filter r300g r600g radeonsi, $(MESA_GPU_DRIVERS)),) -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 -ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),) -SUBDIRS += drivers/radeonsi -SUBDIRS += winsys/amdgpu/drm -endif -endif -endif - -# vc4 -ifneq ($(filter vc4, $(MESA_GPU_DRIVERS)),) +SUBDIRS += winsys/nouveau/drm drivers/nouveau +SUBDIRS += drivers/r300 drivers/r600 drivers/radeon drivers/radeonsi +SUBDIRS += winsys/amdgpu/drm winsys/radeon/drm SUBDIRS += winsys/vc4/drm drivers/vc4 -endif - -# virgl -ifneq ($(filter virgl, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl -endif - -# vmwgfx -ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/svga/drm drivers/svga -endif -# Gallium state trackers and target for dri SUBDIRS += state_trackers/dri targets/dri include $(call all-named-subdir-makefiles,$(SUBDIRS)) |