ci: Stick to Android NDK r25

The latest (r26) does not support API level 19.
frida · Jan 15, 2024 · f33e2d3 · f33e2d3
1 parent 7d5db89
commit f33e2d3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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