[glib/wip/pwithnall/update-other-cis: 3/3] ci: Update Android NDK image to Fedora 34

[Philip Withnall <pwithnall src gnome org>]

commit 46c6ed231ed27878eaa128a4aaa3d96589ea03dc
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Mar 18 11:18:13 2022 +0000

    ci: Update Android NDK image to Fedora 34
    
    Don’t take the opportunity to add support for Android API 31 or update
    the version of the Android NDK we’re using to r23b, though, as I
    couldn’t quickly get that to work and ran out of time.
    
    Bumping the Fedora version will at least reduce our CI repository disk
    usage through sharing the base image.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Helps: #2605

 .gitlab-ci.yml                    |  2 +-
 .gitlab-ci/android-ndk.Dockerfile | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 491d7d1bd..b44008ab0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v13"
   COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v3"
   DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v9"
-  ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v5"
+  ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v6"
   MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v5"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   G_MESSAGES_DEBUG: all
diff --git a/.gitlab-ci/android-ndk.Dockerfile b/.gitlab-ci/android-ndk.Dockerfile
index 5ef4fc507..1ea3622e7 100644
--- a/.gitlab-ci/android-ndk.Dockerfile
+++ b/.gitlab-ci/android-ndk.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:34
 
 RUN dnf -y install \
     autoconf \
@@ -10,7 +10,6 @@ RUN dnf -y install \
     elfutils-libelf-devel \
     findutils \
     fuse \
-    gamin-devel \
     gcc \
     gcc-c++ \
     gettext \
@@ -61,7 +60,17 @@ COPY android-download-ndk.sh .
 RUN ./android-download-ndk.sh
 COPY android-setup-env.sh .
 RUN ./android-setup-env.sh arm64 28
-RUN rm -rf $ANDROID_NDK_PATH
+# Explicitly remove some directories first to fix symlink traversal problems
+RUN rm -rf \
+  $ANDROID_NDK_PATH/sources/third_party/vulkan/src/tests/layers \
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/containers/unord/unord.multimap/unord.multimap.modifiers
 \
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/containers/unord/unord.multiset/unord.multiset.cnstr \
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum
 \
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory_symlink
 \
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.is_directory 
\
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_hard_link
 \
+  
$ANDROID_NDK_PATH/sources/cxx-stl/llvm-libc++/test/std/experimental/filesystem/fs.op.funcs/fs.op.create_directory
 \
+  $ANDROID_NDK_PATH
 
 RUN pip3 install meson==0.52.0