From f33e2d3e693aee75ddbf967fef47b580336822c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Mon, 15 Jan 2024 14:07:29 +0100
Subject: [PATCH] ci: Stick to Android NDK r25

The latest (r26) does not support API level 19.
---
 .github/env/emit-android-arm.sh    | 2 +-
 .github/env/emit-android-arm64.sh  | 2 +-
 .github/env/emit-android-x86.sh    | 2 +-
 .github/env/emit-android-x86_64.sh | 2 +-
 .github/workflows/ci.yml           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/env/emit-android-arm.sh b/.github/env/emit-android-arm.sh
index 7f9062d55d..bd237b6ac3 100755
--- a/.github/env/emit-android-arm.sh
+++ b/.github/env/emit-android-arm.sh
@@ -3,7 +3,7 @@
 pkgconfig=$1
 needs_exe_wrapper=$2
 
-bindir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
+bindir=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
 
 cat << EOF
 [constants]
diff --git a/.github/env/emit-android-arm64.sh b/.github/env/emit-android-arm64.sh
index 41a2e3d32a..0bfd5f3f42 100755
--- a/.github/env/emit-android-arm64.sh
+++ b/.github/env/emit-android-arm64.sh
@@ -3,7 +3,7 @@
 pkgconfig=$1
 needs_exe_wrapper=$2
 
-bindir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
+bindir=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
 
 cat << EOF
 [constants]
diff --git a/.github/env/emit-android-x86.sh b/.github/env/emit-android-x86.sh
index 6e03e0c0d1..6f380e3263 100755
--- a/.github/env/emit-android-x86.sh
+++ b/.github/env/emit-android-x86.sh
@@ -3,7 +3,7 @@
 pkgconfig=$1
 needs_exe_wrapper=$2
 
-bindir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
+bindir=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
 
 cat << EOF
 [constants]
diff --git a/.github/env/emit-android-x86_64.sh b/.github/env/emit-android-x86_64.sh
index 5c1cf93411..d7fb58c3ae 100755
--- a/.github/env/emit-android-x86_64.sh
+++ b/.github/env/emit-android-x86_64.sh
@@ -3,7 +3,7 @@
 pkgconfig=$1
 needs_exe_wrapper=$2
 
-bindir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
+bindir=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)/bin
 
 cat << EOF
 [constants]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71ec6ef6d3..284c58c2d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -337,11 +337,11 @@ jobs:
             adb shell "su root sh -c 'set -ex; cd /data/local/tmp; tar xf runner.tar.gz; TMPDIR=/data/local/tmp ./gum-tests'"
 
   android-arm:
-    if: false
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [arm, arm64]
+        #arch: [arm, arm64]
+        arch: [arm]
       fail-fast: false
     steps:
       - name: Check out repo