Skip to content

Commit e563156

Browse files
committed
downgrade API of arm and arm64 to API-24
1 parent 3ff2bd8 commit e563156

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

ci/android-install-ndk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ unzip -q ${NDK}-linux-x86_64.zip
1818
case "$1" in
1919
arm)
2020
arch=arm
21-
api=25
21+
api=24
2222
;;
2323
armv7)
2424
arch=arm
25-
api=25
25+
api=24
2626
;;
2727
aarch64)
2828
arch=arm64
29-
api=25
29+
api=24
3030
;;
3131
i686)
3232
arch=x86

ci/android-install-sdk.sh

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,27 @@ set -ex
1919
# which apparently magically accepts the licenses.
2020

2121
SDK=4333796
22-
API=25
2322
mkdir sdk
2423
curl --retry 10 https://dl.google.com/android/repository/sdk-tools-linux-${SDK}.zip -O
2524
unzip -q -d sdk sdk-tools-linux-${SDK}.zip
2625

2726
case "$1" in
2827
arm | armv7)
29-
image="system-images;android-25;google_apis;armeabi-v7a"
28+
api=24
29+
image="system-images;android-${api};google_apis;armeabi-v7a"
3030
;;
31-
3231
aarch64)
33-
image="system-images;android-25;google_apis;arm64-v8a"
32+
api=24
33+
image="system-images;android-${api};google_apis;arm64-v8a"
3434
;;
35-
3635
i686)
37-
image="system-images;android-28;default;x86"
36+
api=28
37+
image="system-images;android-${api};default;x86"
3838
;;
39-
4039
x86_64)
41-
image="system-images;android-28;default;x86_64"
40+
api=28
41+
image="system-images;android-${api};default;x86_64"
4242
;;
43-
4443
*)
4544
echo "invalid arch: $1"
4645
exit 1
@@ -65,7 +64,7 @@ yes | ./sdk/tools/bin/sdkmanager --licenses --no_https | grep -v = || true
6564
yes | ./sdk/tools/bin/sdkmanager --no_https \
6665
"emulator" \
6766
"platform-tools" \
68-
"platforms;android-${API}" \
67+
"platforms;android-${api}" \
6968
"${image}" | grep -v = || true
7069

7170
echo "no" |

0 commit comments

Comments
 (0)