[Mesa-dev] [RFC][PATCH 5/5] Android.mk: Fix checkbuild on Mac builders.

Emil Velikov emil.l.velikov at gmail.com
Wed Jul 25 12:48:53 UTC 2018


On 25 July 2018 at 00:21, John Stultz <john.stultz at linaro.org> wrote:
> From: Alistair Strachan <astrachan at google.com>
>
> This is a forward port of a patch in the AOSP/master tree:
> https://android.googlesource.com/platform/external/mesa3d/+/d7f894a7d39e66ca5a832c19edaf175400041aff%5E%21/
>
> The libmesa_dri_common target depends on xgettext unconditionally, but
> this is not a documented dependency of AOSP and is not installed on the
> Mac builders, so we must not build any part of mesa3d on these
> platforms.
>
> Cc: Rob Herring <rob.herring at linaro.org>
> Cc: Alistair Strachan <astrachan at google.com>
> Cc: Marissa Wall <marissaw at google.com>
> Cc: Sumit Semwal <sumit.semwal at linaro.org>
> Cc: Emil Velikov <emil.l.velikov at gmail.com>
> Cc: Rob Clark <robdclark at gmail.com>
> Signed-off-by: Alistair Strachan <astrachan at google.com>
> Signed-off-by: John Stultz <john.stultz at linaro.org>
> ---
>  Android.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/Android.mk b/Android.mk
> index 494b4b9..128db4d 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -30,6 +30,8 @@
>  # module will also be built.  DRI modules will be loaded by libGLES_mesa.
>
>  ifneq ($(BOARD_USE_CUSTOMIZED_MESA), true)
> +ifneq ($(BOARD_GPU_DRIVERS),)
> +

Something looks fairly weird here. Commit message talks about Mac and
xgettext while this here checks for BOARD_GPU_DRIVERS.
IIRC, libGLES_mesa must be explicitly pulled in the device
manifest/project in order to for Mesa be built. The exact same one
tends to set BOARD_GPU_DRIVERS.

Or looking it from another angle - if the Mac builder is missing
xgettext one could add it, becoming in sync with other builders.
Quick search shows that it's available in brew (brew install gettext)
and one can build it locally.

-Emil


More information about the mesa-dev mailing list