[Mesa-dev] [PATCH 07/12] Android: remove needless conditional including of child makefiles

[Rob Herring]

On Mon, May 1, 2017 at 1:50 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 27 April 2017 at 20:43, Rob Herring <robh at kernel.org> wrote:
>> 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 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(-)
>>
> Nice diff stat!
>
>>  # 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
>
> Out of curiosity - is Android OK if we list the same location twice in  SUBDIRS?
> If yes, keeping the lot grouped up as originally provides very good
> visual aid, illustrating which components go together.

If not, we should be able to use $(sort) as that eliminates
duplicates. We already separate out the places where we care about the
order (as those broke with kati).

Rob