From 365739d6099cc941a2400ec1beba121c6c43fa7a Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 14 Nov 2021 20:17:30 +0000
Subject: [PATCH] Give psi29a's custom android-ndk22 a go

---
 .gitlab-ci.yml               | 8 +++-----
 CI/before_install.android.sh | 4 ++--
 CI/before_script.android.sh  | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9ce5612e2..9f985856ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -458,23 +458,21 @@ Windows_MSBuild_Tests_RelWithDebInfo:
 Debian_AndroidNDK_arm64-v8a:
   tags:
     - linux
-  image: debian:bullseye
+  image: psi29a/android-ndk:focal-ndk22
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"  
   variables:
     CCACHE_SIZE: 3G
   cache:
-    key: Debian_AndroidNDK_arm64-v8a.v3
+    key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v1
     paths:
       - apt-cache/
       - ccache/
       - build/extern/fetched/
   before_script:
     - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-    - echo "deb http://deb.debian.org/debian unstable main contrib" > /etc/apt/sources.list
-    - echo "google-android-ndk-installer google-android-installers/mirror select https://dl.google.com" | debconf-set-selections
     - apt-get update -yq
-    - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential google-android-ndk-installer
+    - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential
   stage: build
   script:
     - export CCACHE_BASEDIR="`pwd`"
diff --git a/CI/before_install.android.sh b/CI/before_install.android.sh
index 59d98f48c4..712ded2769 100755
--- a/CI/before_install.android.sh
+++ b/CI/before_install.android.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -ex
 
-curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20201230.zip -o ~/openmw-android-deps.zip
-unzip -o ~/openmw-android-deps -d /usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr > /dev/null
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20211114.zip -o ~/openmw-android-deps.zip
+unzip -o ~/openmw-android-deps -d /android-ndk-r22/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr > /dev/null
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 3219f3a4ba..bdf7d4a244 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -7,9 +7,10 @@ mkdir -p build
 cd build
 
 cmake \
--DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake \
+-DCMAKE_TOOLCHAIN_FILE=/android-ndk-r22/build/cmake/android.toolchain.cmake \
 -DANDROID_ABI=arm64-v8a \
 -DANDROID_PLATFORM=android-21 \
+-DANDROID_LD=deprecated \
 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 -DCMAKE_INSTALL_PREFIX=install \
@@ -22,7 +23,5 @@ cmake \
 -DBUILD_OPENCS=0 \
 -DBUILD_WIZARD=0 \
 -DOPENMW_USE_SYSTEM_MYGUI=OFF \
--DOPENMW_USE_SYSTEM_OSG=OFF \
--DOPENMW_USE_SYSTEM_BULLET=OFF \
 -DOPENMW_USE_SYSTEM_SQLITE3=OFF \
 ..