Skip to content

Commit 5d4c974

Browse files
committed
Remove Crystax from Dockerfile and .travis.yml
1 parent 5fc5241 commit 5d4c974

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ env:
1717
global:
1818
- ANDROID_SDK_HOME=/opt/android/android-sdk
1919
- ANDROID_NDK_HOME=/opt/android/android-ndk
20-
- CRYSTAX_NDK_HOME=/opt/android/crystax-ndk
2120
matrix:
2221
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python3'
2322
# overrides requirements to skip `peewee` pure python module, see:
2423
# https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
2524
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools'
2625
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --bootstrap sdl2 --requirements python2,numpy'
27-
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3crystax.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $CRYSTAX_NDK_HOME --requirements python3crystax,setuptools,android,sdl2,pyjnius,kivy'
2826
# builds only the recipes that moved
2927
- COMMAND='. venv/bin/activate && ./ci/rebuild_updated_recipes.py'
3028

Dockerfile

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,16 @@ ENV WORK_DIR="${HOME_DIR}" \
1616
PATH="${HOME_DIR}/.local/bin:${PATH}"
1717
# get the latest version from https://developer.android.com/ndk/downloads/index.html
1818
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"
2119
# get the latest version from https://developer.android.com/studio/index.html
2220
ENV ANDROID_SDK_TOOLS_VERSION="3859397"
2321

2422
ENV ANDROID_HOME="/opt/android"
2523
ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" \
26-
CRYSTAX_NDK_HOME="${ANDROID_HOME}/crystax-ndk" \
2724
ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
2825
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" \
29-
CRYSTAX_NDK_HOME_V="${CRYSTAX_NDK_HOME}-${CRYSTAX_NDK_VERSION}"
3026
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" \
3227
ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
3328
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}" \
3529
ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
3630

3731
# install system dependencies
@@ -58,21 +52,6 @@ RUN curl --location --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_N
5852
ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" && \
5953
rm -rf "${ANDROID_NDK_ARCHIVE}"
6054

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-
7655
# download and install Android SDK
7756
RUN curl --location --progress-bar "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" && \
7857
mkdir --parents "${ANDROID_SDK_HOME}" && \

0 commit comments

Comments
 (0)