Skip to content

Commit 20292e5

Browse files
AndreMirasAndreMiras
committed
Build testapp using setup_testapp_python3
Has the following requirements: sdl2,pyjnius,kivy,python3crystax Also updated Dockerfile to download and install CrystaX NDK. Refs kivy#1263
1 parent f47e35e commit 20292e5

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
# overrides requirements to skip `peewee` pure python module, see:
1616
# https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
1717
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/android-ndk --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3'
18+
- COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir /opt/android/android-sdk --ndk-dir /opt/android/crystax-ndk'
1819

1920
script:
2021
- docker run p4a /bin/sh -c "$COMMAND"

‎Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@ FROM ubuntu:16.04
1616

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"
1921
# get the latest version from https://developer.android.com/studio/index.html
2022
ENV ANDROID_SDK_TOOLS_VERSION="3859397"
2123

2224
ENV ANDROID_HOME="/opt/android"
2325
ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" \
26+
CRYSTAX_NDK_HOME="${ANDROID_HOME}/crystax-ndk" \
2427
ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
25-
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
28+
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" \
29+
CRYSTAX_NDK_HOME_V="${CRYSTAX_NDK_HOME}-${CRYSTAX_NDK_VERSION}"
2630
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" \
2732
ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
2833
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}" \
2935
ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
3036

3137
# install system dependencies
@@ -46,6 +52,11 @@ RUN curl --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_NDK_ARCHIVE}
4652
unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" && \
4753
ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}"
4854

55+
# download and install CrystaX NDK
56+
RUN curl --progress-bar "${CRYSTAX_NDK_DL_URL}" --output "${CRYSTAX_NDK_ARCHIVE}" && \
57+
tar -xf "${CRYSTAX_NDK_ARCHIVE}" --directory "${ANDROID_HOME}" && \
58+
ln -sfn "${CRYSTAX_NDK_HOME_V}" "${CRYSTAX_NDK_HOME}"
59+
4960
# download and install Android SDK
5061
RUN curl --progress-bar "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" && \
5162
mkdir --parents "${ANDROID_SDK_HOME}" && \

0 commit comments

Comments
 (0)