diff options
| author | Albin <albin@mullvad.net> | 2022-10-21 17:13:06 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-10-24 18:07:35 +0200 |
| commit | babb41c722cddaf1020c756293e58602357fc47d (patch) | |
| tree | 9ef6ecf88e026ec39ee4abb77339a35eec6c8859 /android/docker | |
| parent | ade7ece5a0494190b87aeebccfdb4840620dfc7d (diff) | |
| download | mullvadvpn-babb41c722cddaf1020c756293e58602357fc47d.tar.xz mullvadvpn-babb41c722cddaf1020c756293e58602357fc47d.zip | |
Cleanup redundant cross-compilation Android config
Diffstat (limited to 'android/docker')
| -rw-r--r-- | android/docker/Dockerfile | 30 | ||||
| -rw-r--r-- | android/docker/cargo-config.toml | 15 |
2 files changed, 20 insertions, 25 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 8ecf7c4a87..1ea4ffa8a3 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -36,21 +36,33 @@ ENV SDK_TOOLS_VERSION=4333796 \ # NDK and checksum from: https://github.com/android/ndk/wiki/Unsupported-Downloads ENV NDK_VERSION=r20b \ - NDK_SHA1_CHECKSUM=d903fdf077039ad9331fb6c3bee78aa46d45527b + NDK_SHA1_CHECKSUM=d903fdf077039ad9331fb6c3bee78aa46d45527b \ + MIN_SDK_VERSION=21 ENV ANDROID_HOME=/opt/android ENV ANDROID_NDK_HOME=${ANDROID_HOME}/android-ndk-${NDK_VERSION} ENV NDK_TOOLCHAIN_DIR=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin ENV GRADLE_USER_HOME=/root/.gradle +# Rust cross-compilation for: aarch64 +ENV AR_aarch64_linux_android=${NDK_TOOLCHAIN_DIR}/aarch64-linux-android-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 \ + 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 \ + 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 \ - AR_i686_linux_android=${NDK_TOOLCHAIN_DIR}/i686-linux-android-ar \ - AR_aarch64_linux_android=${NDK_TOOLCHAIN_DIR}/aarch64-linux-android-ar \ - AR_armv7_linux_androideabi=${NDK_TOOLCHAIN_DIR}/arm-linux-androideabi-ar \ - CC_x86_64_linux_android=${NDK_TOOLCHAIN_DIR}/x86_64-linux-android21-clang \ - CC_i686_linux_android=${NDK_TOOLCHAIN_DIR}/i686-linux-android21-clang \ - CC_aarch64_linux_android=${NDK_TOOLCHAIN_DIR}/aarch64-linux-android21-clang \ - CC_armv7_linux_androideabi=${NDK_TOOLCHAIN_DIR}/armv7a-linux-androideabi21-clang + 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 # === Install/set up the image === @@ -94,8 +106,6 @@ RUN patch -p1 -f -N -r- -d /usr/local/go < /tmp/goruntime-boottime-over-monotoni rm /tmp/goruntime-boottime-over-monotonic.diff # Add rust targets -# NOTE: The config.toml overrides the one created in the base image. -COPY cargo-config.toml /root/.cargo/config.toml RUN rustup target add x86_64-linux-android i686-linux-android aarch64-linux-android armv7-linux-androideabi WORKDIR /build diff --git a/android/docker/cargo-config.toml b/android/docker/cargo-config.toml deleted file mode 100644 index bd056d8496..0000000000 --- a/android/docker/cargo-config.toml +++ /dev/null @@ -1,15 +0,0 @@ -[target.aarch64-linux-android] -ar = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" -linker = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang" - -[target.armv7-linux-androideabi] -ar = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar" -linker = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang" - -[target.x86_64-linux-android] -ar = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar" -linker = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang" - -[target.i686-linux-android] -ar = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar" -linker = "/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang" |