Skip to content

Commit f5a36a8

Browse files
Use new Android NDK in CI
1 parent ffce298 commit f5a36a8

File tree

1 file changed

+7
-23
lines changed

1 file changed

+7
-23
lines changed

ci/android-install-ndk.sh

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,11 @@
1111

1212
set -ex
1313

14-
curl --retry 5 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
15-
unzip -q android-ndk-r15b-linux-x86_64.zip
14+
ANDROID_NDK_URL=https://dl.google.com/android/repository
15+
ANDROID_NDK_ARCHIVE=android-ndk-r25b-linux.zip
1616

17-
case "$1" in
18-
aarch64)
19-
arch=arm64
20-
;;
21-
22-
i686)
23-
arch=x86
24-
;;
25-
26-
*)
27-
arch=$1
28-
;;
29-
esac;
30-
31-
android-ndk-r15b/build/tools/make_standalone_toolchain.py \
32-
--unified-headers \
33-
--install-dir "/android/ndk-${1}" \
34-
--arch "${arch}" \
35-
--api 24
36-
37-
rm -rf ./android-ndk-r15b-linux-x86_64.zip ./android-ndk-r15b
17+
curl -fO "$ANDROID_NDK_URL/$ANDROID_NDK_ARCHIVE"
18+
unzip -q $ANDROID_NDK_ARCHIVE
19+
rm $ANDROID_NDK_ARCHIVE
20+
mv android-ndk-* ndk
21+
rm -rf android-ndk-*

0 commit comments

Comments
 (0)