diff options
| author | Albin <albin@mullvad.net> | 2023-03-17 08:59:26 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-27 11:53:35 +0200 |
| commit | dcf5e3c9210fc3f4ffd13fb903c1a66546870766 (patch) | |
| tree | 6993d7cf4cb0deb9025616bab848e57a5f28ad44 | |
| parent | 3566aa8a8e8bdfa077ea37cc900af2dc953537c2 (diff) | |
| download | mullvadvpn-dcf5e3c9210fc3f4ffd13fb903c1a66546870766.tar.xz mullvadvpn-dcf5e3c9210fc3f4ffd13fb903c1a66546870766.zip | |
Bump NDK in F-Droid env and config
| -rw-r--r-- | android/fdroid-build/cargo-config.toml.template | 16 | ||||
| -rwxr-xr-x | android/fdroid-build/env.sh | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/android/fdroid-build/cargo-config.toml.template b/android/fdroid-build/cargo-config.toml.template index 774da29982..123e3807a4 100644 --- a/android/fdroid-build/cargo-config.toml.template +++ b/android/fdroid-build/cargo-config.toml.template @@ -1,15 +1,15 @@ [target.aarch64-linux-android] -ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" -linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang" +ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" +linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang" [target.armv7-linux-androideabi] -ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar" -linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang" +ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" +linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi26-clang" [target.x86_64-linux-android] -ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar" -linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang" +ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" +linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang" [target.i686-linux-android] -ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar" -linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang" +ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" +linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android26-clang" diff --git a/android/fdroid-build/env.sh b/android/fdroid-build/env.sh index f59478ee64..3e2faf8fe2 100755 --- a/android/fdroid-build/env.sh +++ b/android/fdroid-build/env.sh @@ -10,12 +10,12 @@ export PATH="$PATH:$GOROOT/bin" # Ensure Rust crates know which tools to use for cross-compilation export NDK_TOOLCHAIN_DIR="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin" -export AR_i686_linux_android="$NDK_TOOLCHAIN_DIR/i686-linux-android-ar" -export AR_x86_64_linux_android="$NDK_TOOLCHAIN_DIR/x86_64-linux-android-ar" -export AR_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/aarch64-linux-android-ar" -export AR_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/arm-linux-androideabi-ar" +export AR_i686_linux_android="$NDK_TOOLCHAIN_DIR/llvm-ar" +export AR_x86_64_linux_android="$NDK_TOOLCHAIN_DIR/llvm-ar" +export AR_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/llvm-ar" +export AR_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/llvm-ar" -export CC_i686_linux_android="$NDK_TOOLCHAIN_DIR/i686-linux-android21-clang" -export CC_x86_64_linux_android="$NDK_TOOLCHAIN_DIR/x86_64-linux-android21-clang" -export CC_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/aarch64-linux-android21-clang" -export CC_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/armv7a-linux-androideabi21-clang" +export CC_i686_linux_android="$NDK_TOOLCHAIN_DIR/i686-linux-android26-clang" +export CC_x86_64_linux_android="$NDK_TOOLCHAIN_DIR/x86_64-linux-android26-clang" +export CC_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/aarch64-linux-android26-clang" +export CC_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/armv7a-linux-androideabi26-clang" |