Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #4285 from talregev/TalR_ndk_15c 

[Android] Switch to ndk 15c for armv6
This commit is contained in:
Vitalii Koshura 2021-03-26 19:46:30 +01:00 committed by GitHub
parent bdae15bce6 b896b15aba
commit 1ed924fc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/buildAndroidBOINC-CI.sh
View File

@ -24,7 +24,7 @@ export REV=1
export OPENSSL_VERSION=1.0.2s
export CURL_VERSION=7.62.0
export NDK_VERSION=21d
export NDK_ARMV6_VERSION=16b
export NDK_ARMV6_VERSION=15c
export ANDROID_HOME=$HOME/Android/Sdk
export NDK_ROOT=$HOME/Android/Ndk

2
android/build_androidtc_armv6.sh
View File

@ -12,5 +12,5 @@ export ANDROID_TC="${ANDROID_TC:-$HOME/android-tc}"
export ANDROID_TC_ARMV6="${ANDROID_TC_ARMV6:-$ANDROID_TC/armv6}"
if [ ! -d "$ANDROID_TC_ARMV6/arm-linux-androideabi" ]; then
"$NDK_ARMV6_ROOT/build/tools/make-standalone-toolchain.sh" --verbose --toolchain=arm-linux-androideabi-clang --platform=android-16 --arch=arm --stl=gnustl --install-dir="$ANDROID_TC_ARMV6" "$@"
"$NDK_ARMV6_ROOT/build/tools/make-standalone-toolchain.sh" --verbose --toolchain=arm-linux-androideabi-clang --platform=android-16 --arch=arm --stl=libc++ --install-dir="$ANDROID_TC_ARMV6" "$@"
fi