[CI] [PATCH 1/2] Enable compilation of the Android camera HAL

[Kieran Bingham]

Quoting Laurent Pinchart (2024-05-27 18:40:15)
> Expend compilation test coverage by enabling the Android camera HAL in

Extend? Expand?

> test builds. This requires adding the cmake package to the container
> images, as it is needed to build the libyuv subproject. Debian buster
> ships a too old cmake version, so disable the Android HAL compilation
> there.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  .gitlab-ci/setup-container.sh |  1 +
>  gitlab-ci.yml                 | 10 +++++++---
>  2 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> index 6f75c3209eb7..fc3c0568bf7c 100755
> --- a/.gitlab-ci/setup-container.sh
> +++ b/.gitlab-ci/setup-container.sh
> @@ -34,6 +34,7 @@ PKGS_LIBCAMERA_CBUILD=(
>  PKGS_LIBCAMERA_RUNTIME=(
>         clang
>         clang-format
> +       cmake
>         doxygen
>         g++
>         ghostscript
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index 60e52deac520..465931a761fc 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -12,6 +12,7 @@ variables:
>    GIT_DEPTH: 1
>    KERNEL_VERSION: '6.6'
>    MESON_ALL_OPTIONS: >-
> +    -D android=enabled
>      -D cam=enabled
>      -D documentation=enabled
>      -D gstreamer=enabled
> @@ -58,17 +59,17 @@ include:
>  .libcamera-ci.debian:11:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'bullseye'
> -    FDO_DISTRIBUTION_TAG: '2024-05-07.1'
> +    FDO_DISTRIBUTION_TAG: '2024-05-27.0'
>  
>  .libcamera-ci.debian:12:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'bookworm'
> -    FDO_DISTRIBUTION_TAG: '2024-04-18.0'
> +    FDO_DISTRIBUTION_TAG: '2024-05-27.0'
>  
>  .libcamera-ci.debian:13:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2024-04-18.0'
> +    FDO_DISTRIBUTION_TAG: '2024-05-27.0'
>  
>  .container-debian:
>    extends:
> @@ -159,6 +160,9 @@ build-full:debian:10:
>      ARCH: amd64
>      CC: gcc-8
>      CXX: g++-8
> +    MESON_OPTIONS: >-
> +      ${MESON_ALL_OPTIONS}
> +      -D android=disabled

I would suggest we add a comment above build-full:debian:10: to say
"Android is disabled as the packaged cmake is too old"

But we don't have comments on these two either

 - build-full:debian:12: # Ensure documentation builds warning free
 - build-full:debian:13: # Provide compile testing for C++20

which also modify the MESON_OPTIONS so I think it's probably fine as is.

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

>  
>  build-full:debian:11:
>    extends:
> -- 
> Regards,
> 
> Laurent Pinchart
>