From f7fd4f57abd08efb0cc550e6eb4e8d087b6cec80 Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 6 May 2023 22:08:19 +0800 Subject: [PATCH] delta chat: try fix ndk version --- metadata/com.b44t.messenger.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml index 80057ed7f6..dd8e3a063e 100644 --- a/metadata/com.b44t.messenger.yml +++ b/metadata/com.b44t.messenger.yml @@ -2439,7 +2439,6 @@ Builds: - rustup@1.25.1 - maplibre-gl-native@android-v9.5.2 prebuild: - - sdkmanager 'ndk;20.0.5594570' - sed -i -e '/versionCode/s/$/2/' -e 's/abiFilters .*/abiFilters "arm64-v8a"/' -e '/^repositories {/a mavenLocal()' build.gradle - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle @@ -2462,8 +2461,9 @@ Builds: - $$rustup$$/rustup-init.sh -y - 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 arm64-v8a + - 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 - versionName: 1.36.5 @@ -2480,7 +2480,6 @@ Builds: - rustup@1.25.1 - maplibre-gl-native@android-v9.5.2 prebuild: - - sdkmanager 'ndk;20.0.5594570' - sed -i -e '/versionCode/s/$/3/' -e 's/abiFilters .*/abiFilters "x86"/' -e '/^repositories {/a mavenLocal()' build.gradle - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle @@ -2503,8 +2502,9 @@ Builds: - $$rustup$$/rustup-init.sh -y - 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 x86 + - 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 - versionName: 1.36.5 @@ -2521,7 +2521,6 @@ Builds: - rustup@1.25.1 - maplibre-gl-native@android-v9.5.2 prebuild: - - sdkmanager 'ndk;20.0.5594570' - sed -i -e '/versionCode/s/$/4/' -e 's/abiFilters .*/abiFilters "x86_64"/' -e '/^repositories {/a mavenLocal()' build.gradle - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle @@ -2544,8 +2543,9 @@ Builds: - $$rustup$$/rustup-init.sh -y - 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 x86_64 + - 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 AutoUpdateMode: Version