diff options
| author | Albin <albin@mullvad.net> | 2023-03-10 16:41:04 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-14 15:43:15 +0100 |
| commit | 76f9426c0c4871086f2832a76a1a423a656aa73c (patch) | |
| tree | 66e5c4b3e1d2086f1bd40408629e481d075cd908 /android | |
| parent | eff4bc71111ed0777b6db89d6e104f4478b5cf29 (diff) | |
| download | mullvadvpn-76f9426c0c4871086f2832a76a1a423a656aa73c.tar.xz mullvadvpn-76f9426c0c4871086f2832a76a1a423a656aa73c.zip | |
Bump NDK version to r25c
Diffstat (limited to 'android')
| -rw-r--r-- | android/docker/Dockerfile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 32048d8bfa..9f9ccb7345 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -34,9 +34,9 @@ ARG SDK_VERSION=platforms;android-33 \ ARG COMMAND_LINE_TOOLS_VERSION=9123335 \ COMMAND_LINE_TOOLS_SHA256_CHECKSUM=0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a -# NDK and checksum from: https://github.com/android/ndk/wiki/Unsupported-Downloads -ARG NDK_VERSION=r20b \ - NDK_SHA1_CHECKSUM=d903fdf077039ad9331fb6c3bee78aa46d45527b \ +# NDK and checksum from: https://github.com/android/ndk/wiki#supported-downloads +ARG NDK_VERSION=r25c \ + NDK_SHA1_CHECKSUM=53af80a1cce9144025b81c78c8cd556bff42bd0e \ MIN_SDK_VERSION=21 ENV ANDROID_SDK_ROOT=/opt/android @@ -47,22 +47,22 @@ ENV NDK_TOOLCHAIN_DIR=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/ ENV GRADLE_USER_HOME=/root/.gradle # Rust cross-compilation for: aarch64 -ENV AR_aarch64_linux_android=${NDK_TOOLCHAIN_DIR}/aarch64-linux-android-ar \ +ENV AR_aarch64_linux_android=${NDK_TOOLCHAIN_DIR}/llvm-ar \ CC_aarch64_linux_android=${NDK_TOOLCHAIN_DIR}/aarch64-linux-android${MIN_SDK_VERSION}-clang \ CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=${NDK_TOOLCHAIN_DIR}/aarch64-linux-android${MIN_SDK_VERSION}-clang # Rust cross-compilation for: armv7 -ENV AR_armv7_linux_androideabi=${NDK_TOOLCHAIN_DIR}/arm-linux-androideabi-ar \ +ENV AR_armv7_linux_androideabi=${NDK_TOOLCHAIN_DIR}/llvm-ar \ CC_armv7_linux_androideabi=${NDK_TOOLCHAIN_DIR}/armv7a-linux-androideabi${MIN_SDK_VERSION}-clang \ CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=${NDK_TOOLCHAIN_DIR}/armv7a-linux-androideabi${MIN_SDK_VERSION}-clang # Rust cross-compilation for: i686 -ENV AR_i686_linux_android=${NDK_TOOLCHAIN_DIR}/i686-linux-android-ar \ +ENV AR_i686_linux_android=${NDK_TOOLCHAIN_DIR}/llvm-ar \ CC_i686_linux_android=${NDK_TOOLCHAIN_DIR}/i686-linux-android${MIN_SDK_VERSION}-clang \ CARGO_TARGET_I686_LINUX_ANDROID_LINKER=${NDK_TOOLCHAIN_DIR}/i686-linux-android${MIN_SDK_VERSION}-clang # Rust cross-compilation for: x86_64 -ENV AR_x86_64_linux_android=${NDK_TOOLCHAIN_DIR}/x86_64-linux-android-ar \ +ENV AR_x86_64_linux_android=${NDK_TOOLCHAIN_DIR}/llvm-ar \ CC_x86_64_linux_android=${NDK_TOOLCHAIN_DIR}/x86_64-linux-android${MIN_SDK_VERSION}-clang \ CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=${NDK_TOOLCHAIN_DIR}/x86_64-linux-android${MIN_SDK_VERSION}-clang @@ -95,7 +95,7 @@ RUN curl -sfLo /tmp/cmdline-tools.zip https://dl.google.com/android/repository/c RUN yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager $SDK_VERSION $BUILD_TOOLS_VERSION "platform-tools" # Install Android NDK -RUN curl -sfLo /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux-x86_64.zip && \ +RUN curl -sfLo /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip && \ echo "$NDK_SHA1_CHECKSUM /tmp/ndk.zip" | sha1sum -c && \ unzip -q /tmp/ndk.zip -d $ANDROID_SDK_ROOT && \ rm /tmp/ndk.zip |