deltachat: fix ndk version and path

This commit is contained in:
linsui 2023-06-28 00:42:24 +08:00
parent 6837cb9e2d
commit d1b5999f8d

View file

@ -2579,15 +2579,15 @@ Builds:
- pushd $$maplibre-gl-native$$/platform/android
- git submodule update --init --recursive
- BUILDTYPE=Release make android-lib-arm-v7
- gradle -Pmapbox.abis=armeabi-v7a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- gradle -Pmapbox.abis=armeabi-v7a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target armv7-linux-androideabi
- source $HOME/.cargo/env
- scripts/install-toolchains.sh
- export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$NDK$$ scripts/ndk-make.sh armeabi-v7a
ndk: r21b
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh armeabi-v7a
ndk: r20
- versionName: 1.38.2
versionCode: 6582
@ -2622,13 +2622,13 @@ Builds:
- gradle -Pmapbox.abis=arm64-v8a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target aarch64-linux-android
- source $HOME/.cargo/env
- scripts/install-toolchains.sh
- sdkmanager 'ndk;r23c'
- export PATH=$PATH:$$SDK$$/ndk/r23c/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/r23c/ scripts/ndk-make.sh arm64-v8a
ndk: r21b
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh arm64-v8a
ndk: r20
- versionName: 1.38.2
versionCode: 6583
@ -2663,13 +2663,13 @@ Builds:
- gradle -Pmapbox.abis=x86 -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target i686-linux-android
- source $HOME/.cargo/env
- scripts/install-toolchains.sh
- sdkmanager 'ndk;r23c'
- export PATH=$PATH:$$SDK$$/ndk/r23c/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/r23c/ scripts/ndk-make.sh x86
ndk: r21b
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh x86
ndk: r20
- versionName: 1.38.2
versionCode: 6584
@ -2704,13 +2704,13 @@ Builds:
- gradle -Pmapbox.abis=x86_64 -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target x86_64-linux-android
- source $HOME/.cargo/env
- scripts/install-toolchains.sh
- sdkmanager 'ndk;r23c'
- export PATH=$PATH:$$SDK$$/ndk/r23c/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/r23c/ scripts/ndk-make.sh x86_64
ndk: r21b
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh x86_64
ndk: r20
AutoUpdateMode: Version
UpdateCheckMode: Tags ^v[\d.]+$