matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump android toolchain version to 21

Browse Source
This commit is contained in:
Tamás Bálint Misius 2023-10-01 10:53:59 +02:00
parent baf484653a
commit 8385796ca1
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/build.sh vendored
View File

@ -143,9 +143,9 @@ elif [[ $BSH_HOST_PLATFORM == darwin ]]; then
elif [[ $BSH_HOST_PLATFORM == android ]]; then elif [[ $BSH_HOST_PLATFORM == android ]]; then
case $BSH_HOST_ARCH in case $BSH_HOST_ARCH in
x86_64) android_toolchain_prefix=x86_64-linux-android ; android_system_version=21; android_arch_abi=x86_64 ;; x86_64) android_toolchain_prefix=x86_64-linux-android ; android_system_version=21; android_arch_abi=x86_64 ;;
x86) android_toolchain_prefix=i686-linux-android ; android_system_version=19; android_arch_abi=x86 ;; x86) android_toolchain_prefix=i686-linux-android ; android_system_version=21; android_arch_abi=x86 ;;
aarch64) android_toolchain_prefix=aarch64-linux-android ; android_system_version=21; android_arch_abi=arm64-v8a ;; aarch64) android_toolchain_prefix=aarch64-linux-android ; android_system_version=21; android_arch_abi=arm64-v8a ;;
arm) android_toolchain_prefix=armv7a-linux-androideabi; android_system_version=19; android_arch_abi=armeabi-v7a;; arm) android_toolchain_prefix=armv7a-linux-androideabi; android_system_version=21; android_arch_abi=armeabi-v7a;;
esac esac
android_toolchain_dir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64 android_toolchain_dir=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64
CC=$android_toolchain_dir/bin/$android_toolchain_prefix$android_system_version-clang CC=$android_toolchain_dir/bin/$android_toolchain_prefix$android_system_version-clang

2
android/AndroidManifest.template.xml
View File

@ -7,7 +7,7 @@
android:installLocation="auto" android:installLocation="auto"
> >
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="21"
android:targetSdkVersion="30" android:targetSdkVersion="30"
/> />
<uses-feature <uses-feature

2
android/cross/arm.ini
View File

@ -1,5 +1,5 @@
[constants] [constants]
android_ndk_toolchain_prefix = 'armv7a-linux-androideabi19-' android_ndk_toolchain_prefix = 'armv7a-linux-androideabi21-'
[host_machine] [host_machine]
system = 'android' system = 'android'

2
android/cross/x86.ini
View File

@ -1,5 +1,5 @@
[constants] [constants]
android_ndk_toolchain_prefix = 'i686-linux-android19-' android_ndk_toolchain_prefix = 'i686-linux-android21-'
[host_machine] [host_machine]
system = 'android' system = 'android'