[Mesa-dev] [PATCH 07/12] Android: remove needless conditional including of child makefiles
Chih-Wei Huang
cwhuang at android-x86.org
Fri Apr 28 02:49:15 UTC 2017
2017-04-28 3:43 GMT+08:00 Rob Herring <robh at kernel.org>:
> 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.
Hmm.. The benefit is faster parsing time.
Though it would be very small.
Anyway, to make the rules cleaner,
I'm not against it.
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
> Android.mk | 8 ------
> src/gallium/Android.mk | 52 +++----------------------------------
> src/mesa/Android.libmesa_dricore.mk | 4 ---
> src/mesa/Android.libmesa_st_mesa.mk | 4 ---
> src/mesa/drivers/dri/Android.mk | 11 +-------
> 5 files changed, 4 insertions(+), 75 deletions(-)
>
> diff --git a/Android.mk b/Android.mk
> index fdbf22fe643a..08daf770f26b 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -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
> diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
> index e67cfab5b316..7c6bda68d59f 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))
> diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
> index 86196ceb36ab..599b9ccd71ed 100644
> --- a/src/mesa/Android.libmesa_dricore.mk
> +++ b/src/mesa/Android.libmesa_dricore.mk
> @@ -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
> diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
> index 92df4ad2845b..de2a60a70ed9 100644
> --- a/src/mesa/Android.libmesa_st_mesa.mk
> +++ b/src/mesa/Android.libmesa_st_mesa.mk
> @@ -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
> diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
> index 72a5593fefad..d4fb670f84ce 100644
> --- a/src/mesa/drivers/dri/Android.mk
> +++ b/src/mesa/drivers/dri/Android.mk
> @@ -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)
> --
> 2.11.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
--
Chih-Wei
Android-x86 project
http://www.android-x86.org
More information about the mesa-dev
mailing list