fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 04:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Android: remove needless conditional including of child makefiles

Browse source 
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>
This commit is contained in:
Rob Herring 2017-05-03 14:35:19 -05:00 • committed by Emil Velikov
parent 88014bc023
commit 2a2dabe1c3
5 changed files with 4 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Android.mk
View file

@ -76,8 +76,6 @@ endif
MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)
# add subdirectories
ifneq ($(strip $(MESA_GPU_DRIVERS)),)
SUBDIRS := \
src/gbm \
src/loader \
@ -92,11 +90,5 @@ SUBDIRS := \
src/vulkan
INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
endif
include $(INC_DIRS)
endif

52
src/gallium/Android.mk
View file

@ -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))

4
src/mesa/Android.libmesa_dricore.mk
View file

@ -24,8 +24,6 @@
# libmesa_dricore.a
# ----------------------------------------------------------------------
ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
LOCAL_PATH := $(call my-dir)
# Import the following variables:
@ -72,5 +70,3 @@ LOCAL_WHOLE_STATIC_LIBRARIES += \
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
endif # MESA_BUILD_CLASSIC

4
src/mesa/Android.libmesa_st_mesa.mk
View file

@ -24,8 +24,6 @@
# libmesa_st_mesa.a
# ----------------------------------------------------------------------
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
LOCAL_PATH := $(call my-dir)
# Import variables:
@ -72,5 +70,3 @@ LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
endif # MESA_BUILD_GALLIUM

11
src/mesa/drivers/dri/Android.mk
View file

@ -56,14 +56,5 @@ MESA_DRI_SHARED_LIBRARIES := \
#-----------------------------------------------
# Build drivers and libmesa_dri_common
SUBDIRS := common
ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),)
SUBDIRS += i915
endif
ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),)
SUBDIRS += i965
endif
SUBDIRS := common i915 i965
include $(foreach d, $(SUBDIRS), $(LOCAL_PATH)/$(d)/Android.mk)