Skip to content

Commit b0f6331

Browse files
committed
chore: Fix the Android CI job
* Bump the targeted API on armeabi and x86 to 19 - Starting with the r24 NDK, Jelly Bean (APIs 16, 17, and 18) is no longer supported. * Build libsodium w/ --disable-pie - Workaround for `ld: error: relocation R_386_PC32 cannot be used against symbol 'crypto_auth_hmacsha512_init'; recompile with -fPIC`
1 parent 7469a52 commit b0f6331

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/scripts/cmake-android

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ ABI=${1:-"armeabi-v7a"}
1010
case $ABI in
1111
armeabi-v7a)
1212
TARGET=armv7a-linux-androideabi
13-
NDK_API=16
13+
NDK_API=19
1414
;;
1515
arm64-v8a)
1616
TARGET=aarch64-linux-android
1717
NDK_API=21
1818
;;
1919
x86)
2020
TARGET=i686-linux-android
21-
NDK_API=16
21+
NDK_API=19
2222
;;
2323
x86_64)
2424
TARGET=x86_64-linux-android
@@ -47,7 +47,7 @@ fi
4747
cd libsodium
4848
git clean -ffdx
4949
autoreconf -fi
50-
./configure --prefix="$PREFIX" --host="$TARGET" --with-sysroot="$SYSROOT" --disable-shared
50+
./configure --prefix="$PREFIX" --host="$TARGET" --with-sysroot="$SYSROOT" --disable-shared --disable-pie
5151
make -j"$(nproc)" install
5252
cd ..
5353

0 commit comments

Comments
 (0)