Mesa (main): android: Drop the Android.mk build system

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 8 20:06:16 UTC 2021


Module: Mesa
Branch: main
Commit: d4b482d378e34b3f17005bc6244f24bdd73e94a0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4b482d378e34b3f17005bc6244f24bdd73e94a0

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Mon Jun  7 11:40:11 2021 -0500

android: Drop the Android.mk build system

Android.mk files haven't really been supported by Mesa devs for a long
time.  Most of us have been willing to update Makefile.sources if we
remember and sometimes we try to blind code some Android.mk for a new
generator.  However, the reality is that it breaks regularly and ends up
being maintained by the Android community.  To address this problem
another approach was implemented in !10183 utilizing the maintained
meson build system.  The old Android.mk files are no longer required.

This commit was created with the following commands:

    git rm **/Android.mk
    git rm **/Android.*.mk
    git rm **/Makefile.sources
    git rm CleanSpec.mk

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4487
Acked-by: Roman Stratiienko <r.stratiienko at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9728>

---

 Android.common.mk                                  | 136 ----
 Android.mk                                         | 132 ----
 CleanSpec.mk                                       |  16 -
 android/Android.mk                                 | 154 -----
 docs/install.rst                                   |  10 +-
 src/amd/Android.addrlib.mk                         |  52 --
 src/amd/Android.common.mk                          | 125 ----
 src/amd/Android.compiler.mk                        |  92 ---
 src/amd/Android.mk                                 |  33 -
 src/amd/Makefile.sources                           | 129 ----
 src/amd/vulkan/Android.mk                          | 152 -----
 src/amd/vulkan/Makefile.sources                    | 111 ----
 src/broadcom/Android.cle.mk                        |  39 --
 src/broadcom/Android.genxml.mk                     |  83 ---
 src/broadcom/Android.mk                            |  29 -
 src/broadcom/Makefile.sources                      |  62 --
 src/compiler/Android.glsl.gen.mk                   | 107 ----
 src/compiler/Android.glsl.mk                       |  55 --
 src/compiler/Android.mk                            |  52 --
 src/compiler/Android.nir.gen.mk                    | 124 ----
 src/compiler/Android.nir.mk                        |  51 --
 src/compiler/Makefile.sources                      | 406 ------------
 src/egl/Android.mk                                 |  95 ---
 src/egl/Makefile.sources                           |  32 -
 src/etnaviv/Android.mk                             |  28 -
 src/etnaviv/drm/Android.mk                         |  46 --
 src/etnaviv/drm/Makefile.sources                   |  10 -
 src/freedreno/Android.common.mk                    |  43 --
 src/freedreno/Android.drm.mk                       |  43 --
 src/freedreno/Android.ir2.mk                       |  46 --
 src/freedreno/Android.ir3.mk                       | 102 ---
 src/freedreno/Android.isa.mk                       | 123 ----
 src/freedreno/Android.mk                           |  34 -
 src/freedreno/Android.perfcntrs.mk                 |  43 --
 src/freedreno/Android.registers.mk                 | 100 ---
 src/freedreno/Makefile.sources                     |  97 ---
 src/gallium/Android.common.mk                      |  36 --
 src/gallium/Android.mk                             |  59 --
 src/gallium/auxiliary/Android.mk                   | 109 ----
 src/gallium/auxiliary/Makefile.sources             | 465 --------------
 src/gallium/auxiliary/pipe-loader/Android.mk       |  45 --
 src/gallium/auxiliary/pipe-loader/Makefile.sources |   9 -
 src/gallium/drivers/etnaviv/Android.mk             |  44 --
 src/gallium/drivers/etnaviv/Makefile.sources       |  84 ---
 src/gallium/drivers/freedreno/Android.mk           |  77 ---
 src/gallium/drivers/freedreno/Makefile.sources     | 216 -------
 src/gallium/drivers/i915/Android.mk                |  41 --
 src/gallium/drivers/i915/Makefile.sources          |  42 --
 src/gallium/drivers/iris/Android.mk                | 183 ------
 src/gallium/drivers/iris/Makefile.sources          |  58 --
 src/gallium/drivers/kmsro/Android.mk               |  58 --
 src/gallium/drivers/kmsro/Makefile.sources         |   2 -
 src/gallium/drivers/lima/Android.mk                | 111 ----
 src/gallium/drivers/llvmpipe/Makefile.sources      |  76 ---
 src/gallium/drivers/nouveau/Android.mk             |  57 --
 src/gallium/drivers/nouveau/Makefile.sources       | 214 -------
 src/gallium/drivers/panfrost/Android.mk            |  59 --
 src/gallium/drivers/panfrost/Makefile.sources      |  19 -
 src/gallium/drivers/r300/Android.mk                |  48 --
 src/gallium/drivers/r300/Makefile.sources          | 110 ----
 src/gallium/drivers/r600/Android.mk                |  65 --
 src/gallium/drivers/r600/Makefile.sources          | 170 -----
 src/gallium/drivers/radeonsi/Android.mk            |  71 ---
 src/gallium/drivers/radeonsi/Makefile.sources      |  75 ---
 src/gallium/drivers/softpipe/Android.mk            |  42 --
 src/gallium/drivers/softpipe/Makefile.sources      |  56 --
 src/gallium/drivers/svga/Android.mk                |  45 --
 src/gallium/drivers/svga/Makefile.sources          | 108 ----
 src/gallium/drivers/tegra/Makefile.sources         |   6 -
 src/gallium/drivers/v3d/Makefile.sources           |  36 --
 src/gallium/drivers/vc4/Android.mk                 |  55 --
 src/gallium/drivers/vc4/Makefile.sources           |  64 --
 src/gallium/drivers/virgl/Android.mk               |  41 --
 src/gallium/drivers/virgl/Makefile.sources         |  20 -
 src/gallium/frontends/clover/Makefile.sources      |  70 --
 src/gallium/frontends/dri/Android.mk               |  55 --
 src/gallium/frontends/dri/Makefile.sources         |  17 -
 src/gallium/frontends/glx/xlib/Makefile.sources    |   9 -
 src/gallium/frontends/nine/Makefile.sources        |  82 ---
 src/gallium/frontends/omx/Makefile.sources         |   9 -
 .../frontends/omx/bellagio/Makefile.sources        |  11 -
 src/gallium/frontends/omx/tizonia/Makefile.sources |  22 -
 src/gallium/frontends/osmesa/Makefile.sources      |   2 -
 src/gallium/frontends/va/Makefile.sources          |  20 -
 src/gallium/frontends/vdpau/Makefile.sources       |  13 -
 src/gallium/frontends/wgl/Makefile.sources         |  17 -
 src/gallium/frontends/xa/Makefile.sources          |   8 -
 src/gallium/frontends/xvmc/Makefile.sources        |   7 -
 src/gallium/targets/dri/Android.mk                 | 111 ----
 src/gallium/winsys/amdgpu/drm/Android.mk           |  52 --
 src/gallium/winsys/amdgpu/drm/Makefile.sources     |   9 -
 src/gallium/winsys/etnaviv/drm/Android.mk          |  33 -
 src/gallium/winsys/etnaviv/drm/Makefile.sources    |   3 -
 src/gallium/winsys/freedreno/drm/Android.mk        |  39 --
 src/gallium/winsys/freedreno/drm/Makefile.sources  |   3 -
 src/gallium/winsys/i915/drm/Android.mk             |  41 --
 src/gallium/winsys/i915/drm/Makefile.sources       |   7 -
 src/gallium/winsys/iris/drm/Android.mk             |  40 --
 src/gallium/winsys/iris/drm/Makefile.sources       |   3 -
 src/gallium/winsys/kmsro/drm/Android.mk            |  35 -
 src/gallium/winsys/kmsro/drm/Makefile.sources      |   3 -
 src/gallium/winsys/lima/drm/Android.mk             |  32 -
 src/gallium/winsys/nouveau/drm/Android.mk          |  37 --
 src/gallium/winsys/nouveau/drm/Makefile.sources    |   3 -
 src/gallium/winsys/panfrost/drm/Android.mk         |  33 -
 src/gallium/winsys/panfrost/drm/Makefile.sources   |   3 -
 src/gallium/winsys/radeon/drm/Android.mk           |  37 --
 src/gallium/winsys/radeon/drm/Makefile.sources     |   9 -
 src/gallium/winsys/svga/drm/Android.mk             |  42 --
 src/gallium/winsys/svga/drm/Makefile.sources       |  24 -
 src/gallium/winsys/sw/dri/Android.mk               |  35 -
 src/gallium/winsys/sw/dri/Makefile.sources         |   3 -
 src/gallium/winsys/sw/kms-dri/Android.mk           |  33 -
 src/gallium/winsys/sw/kms-dri/Makefile.sources     |   3 -
 src/gallium/winsys/sw/null/Makefile.sources        |   3 -
 src/gallium/winsys/sw/wrapper/Makefile.sources     |   3 -
 src/gallium/winsys/sw/xlib/Makefile.sources        |   3 -
 src/gallium/winsys/tegra/drm/Makefile.sources      |   3 -
 src/gallium/winsys/v3d/drm/Android.mk              |  33 -
 src/gallium/winsys/v3d/drm/Makefile.sources        |   3 -
 src/gallium/winsys/vc4/drm/Android.mk              |  33 -
 src/gallium/winsys/vc4/drm/Makefile.sources        |   3 -
 src/gallium/winsys/virgl/common/Android.mk         |  35 -
 src/gallium/winsys/virgl/common/Makefile.sources   |   3 -
 src/gallium/winsys/virgl/drm/Android.mk            |  37 --
 src/gallium/winsys/virgl/drm/Makefile.sources      |   5 -
 src/gallium/winsys/virgl/vtest/Android.mk          |  37 --
 src/gallium/winsys/virgl/vtest/Makefile.sources    |   5 -
 src/gbm/Android.mk                                 |  46 --
 src/gbm/Makefile.sources                           |  10 -
 src/intel/Android.blorp.mk                         |  45 --
 src/intel/Android.common.mk                        |  57 --
 src/intel/Android.compiler.mk                      |  67 --
 src/intel/Android.dev.mk                           |  42 --
 src/intel/Android.genxml.mk                        | 124 ----
 src/intel/Android.isl.mk                           | 326 ----------
 src/intel/Android.mk                               |  35 -
 src/intel/Android.perf.mk                          |  52 --
 src/intel/Android.vulkan.mk                        | 318 ---------
 src/intel/Makefile.sources                         | 384 -----------
 src/loader/Android.mk                              |  45 --
 src/loader/Makefile.sources                        |   7 -
 src/mapi/Android.mk                                |  81 ---
 src/mapi/Makefile.sources                          |  38 --
 src/mesa/Android.gen.mk                            | 177 -----
 src/mesa/Android.libmesa_dricore.mk                |  74 ---
 src/mesa/Android.libmesa_git_sha1.mk               |  54 --
 src/mesa/Android.libmesa_glsl_utils.mk             |  74 ---
 src/mesa/Android.libmesa_sse41.mk                  |  47 --
 src/mesa/Android.libmesa_st_mesa.mk                |  71 ---
 src/mesa/Android.mk                                |  29 -
 src/mesa/Makefile.sources                          | 709 ---------------------
 src/mesa/drivers/dri/Android.mk                    |  70 --
 src/mesa/drivers/dri/common/Android.mk             |  69 --
 src/mesa/drivers/dri/common/Makefile.sources       |  18 -
 src/mesa/drivers/dri/i915/Android.mk               |  57 --
 src/mesa/drivers/dri/i915/Makefile.sources         |  64 --
 src/mesa/drivers/dri/i965/Android.mk               | 306 ---------
 src/mesa/drivers/dri/i965/Makefile.sources         | 164 -----
 src/mesa/drivers/dri/nouveau/Makefile.sources      |  62 --
 src/mesa/drivers/dri/r200/Makefile.sources         |  60 --
 src/mesa/drivers/dri/radeon/Makefile.sources       |  58 --
 src/mesa/program/Android.mk                        |  88 ---
 src/panfrost/Android.bifrost.mk                    | 140 ----
 src/panfrost/Android.lib.mk                        |  56 --
 src/panfrost/Android.midgard.mk                    |  88 ---
 src/panfrost/Android.mk                            |  32 -
 src/panfrost/Android.shared.mk                     |  48 --
 src/panfrost/Android.util.mk                       |  50 --
 src/panfrost/Makefile.sources                      | 123 ----
 src/util/Android.mk                                | 101 ---
 src/util/Makefile.sources                          | 159 -----
 src/vulkan/Android.mk                              | 119 ----
 src/vulkan/Makefile.sources                        |  58 --
 174 files changed, 1 insertion(+), 12190 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=d4b482d378e34b3f17005bc6244f24bdd73e94a0


More information about the mesa-commit mailing list