@@ -16,22 +16,16 @@ ENV WORK_DIR="${HOME_DIR}" \
16
16
PATH="${HOME_DIR}/.local/bin:${PATH}"
17
17
# get the latest version from https://developer.android.com/ndk/downloads/index.html
18
18
ENV ANDROID_NDK_VERSION="16b"
19
- # get the latest version from https://www.crystax.net/en/download
20
- ENV CRYSTAX_NDK_VERSION="10.3.2"
21
19
# get the latest version from https://developer.android.com/studio/index.html
22
20
ENV ANDROID_SDK_TOOLS_VERSION="3859397"
23
21
24
22
ENV ANDROID_HOME="/opt/android"
25
23
ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" \
26
- CRYSTAX_NDK_HOME="${ANDROID_HOME}/crystax-ndk" \
27
24
ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
28
25
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" \
29
- CRYSTAX_NDK_HOME_V="${CRYSTAX_NDK_HOME}-${CRYSTAX_NDK_VERSION}"
30
26
ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip" \
31
- CRYSTAX_NDK_ARCHIVE="crystax-ndk-${CRYSTAX_NDK_VERSION}-linux-x86.tar.xz" \
32
27
ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
33
28
ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}" \
34
- CRYSTAX_NDK_DL_URL="https://eu.crystax.net/download/${CRYSTAX_NDK_ARCHIVE}" \
35
29
ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
36
30
37
31
# install system dependencies
@@ -58,21 +52,6 @@ RUN curl --location --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_N
58
52
ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" && \
59
53
rm -rf "${ANDROID_NDK_ARCHIVE}"
60
54
61
- # download and install CrystaX NDK
62
- # added `gnutls_handshake` flag to workaround random `gnutls_handshake()` issues
63
- RUN curl --location --progress-bar "${CRYSTAX_NDK_DL_URL}" --output "${CRYSTAX_NDK_ARCHIVE}" --insecure && \
64
- bsdtar -xf "${CRYSTAX_NDK_ARCHIVE}" --directory "${ANDROID_HOME}" \
65
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/docs \
66
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/samples \
67
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/tests \
68
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/renderscript \
69
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/x86_64-* \
70
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/llvm-* \
71
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/aarch64-* \
72
- --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/mips64el-* && \
73
- ln -sfn "${CRYSTAX_NDK_HOME_V}" "${CRYSTAX_NDK_HOME}" && \
74
- rm -rf "${CRYSTAX_NDK_ARCHIVE}"
75
-
76
55
# download and install Android SDK
77
56
RUN curl --location --progress-bar "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" && \
78
57
mkdir --parents "${ANDROID_SDK_HOME}" && \
0 commit comments