diff options
| author | Albin <albin@mullvad.net> | 2023-03-10 16:45:01 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-14 15:43:16 +0100 |
| commit | 2500ef4ee2d30e300f60887b73ce10bd6370e5ed (patch) | |
| tree | 5a1bc01e50ad006fab302b1a396b6be9c7b007f2 | |
| parent | 76f9426c0c4871086f2832a76a1a423a656aa73c (diff) | |
| download | mullvadvpn-2500ef4ee2d30e300f60887b73ce10bd6370e5ed.tar.xz mullvadvpn-2500ef4ee2d30e300f60887b73ce10bd6370e5ed.zip | |
Bump NDK min sdk to 26
| -rw-r--r-- | android/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | wireguard/libwg/build-android.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 9f9ccb7345..82da167027 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -37,7 +37,7 @@ ARG COMMAND_LINE_TOOLS_VERSION=9123335 \ # NDK and checksum from: https://github.com/android/ndk/wiki#supported-downloads ARG NDK_VERSION=r25c \ NDK_SHA1_CHECKSUM=53af80a1cce9144025b81c78c8cd556bff42bd0e \ - MIN_SDK_VERSION=21 + MIN_SDK_VERSION=26 ENV ANDROID_SDK_ROOT=/opt/android # ANDROID_HOME is kept for backwards compatibility diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh index 8bd5d5a9f3..39ae8919e6 100755 --- a/wireguard/libwg/build-android.sh +++ b/wireguard/libwg/build-android.sh @@ -15,25 +15,25 @@ ANDROID_STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/llvm-strip" for arch in ${ARCHITECTURES:-armv7 aarch64 x86_64 i686}; do case "$arch" in "aarch64") - export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/aarch64-linux-android21-clang" + export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/aarch64-linux-android26-clang" export RUST_TARGET_TRIPLE="aarch64-linux-android" export ANDROID_ABI="arm64-v8a" export ANDROID_ARCH_NAME="arm64" ;; "x86_64") - export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/x86_64-linux-android21-clang" + export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/x86_64-linux-android26-clang" export RUST_TARGET_TRIPLE="x86_64-linux-android" export ANDROID_ABI="x86_64" export ANDROID_ARCH_NAME="x86_64" ;; "armv7") - export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/armv7a-linux-androideabi21-clang" + export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/armv7a-linux-androideabi26-clang" export RUST_TARGET_TRIPLE="armv7-linux-androideabi" export ANDROID_ABI="armeabi-v7a" export ANDROID_ARCH_NAME="arm" ;; "i686") - export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/i686-linux-android21-clang" + export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/i686-linux-android26-clang" export RUST_TARGET_TRIPLE="i686-linux-android" export ANDROID_ABI="x86" export ANDROID_ARCH_NAME="x86" |