commit 75afd06ca3c5d25051014c29b716f73f68ac79f8 parent 98c8c2127ce2dec068d0e530f4405ed8fa85e61a Author: SomberNight <somber.night@protonmail.com> Date: Sat, 31 Aug 2019 19:08:41 +0200 android build: don't download Apache ANT on every build Diffstat:
| M | electrum/gui/kivy/tools/Dockerfile | | | 14 | ++++++++++++++ |
| M | electrum/gui/kivy/tools/buildozer.spec | | | 2 | +- |
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/electrum/gui/kivy/tools/Dockerfile b/electrum/gui/kivy/tools/Dockerfile @@ -69,6 +69,20 @@ RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-24" > /dev/nul "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "extras;android;m2repository" > /dev/null && \ chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager" +# download ANT +ENV APACHE_ANT_VERSION="1.9.4" +ENV APACHE_ANT_ARCHIVE="apache-ant-${APACHE_ANT_VERSION}-bin.tar.gz" +ENV APACHE_ANT_DL_URL="http://archive.apache.org/dist/ant/binaries/${APACHE_ANT_ARCHIVE}" +ENV APACHE_ANT_HOME="${ANDROID_HOME}/apache-ant" +ENV APACHE_ANT_HOME_V="${APACHE_ANT_HOME}-${APACHE_ANT_VERSION}" + +RUN curl --location --progress-bar \ + "${APACHE_ANT_DL_URL}" \ + --output "${APACHE_ANT_ARCHIVE}" \ + && tar -xf "${APACHE_ANT_ARCHIVE}" -C "${ANDROID_HOME}" \ + && ln -sfn "${APACHE_ANT_HOME_V}" "${APACHE_ANT_HOME}" \ + && rm -rf "${APACHE_ANT_ARCHIVE}" + ENV USER="user" ENV HOME_DIR="/home/${USER}" diff --git a/electrum/gui/kivy/tools/buildozer.spec b/electrum/gui/kivy/tools/buildozer.spec @@ -91,7 +91,7 @@ android.ndk_path = /opt/android/android-ndk android.sdk_path = /opt/android/android-sdk # (str) ANT directory (if empty, it will be automatically downloaded.) -#android.ant_path = +android.ant_path = /opt/android/apache-ant # (str) Android entry point, default is ok for Kivy-based app #android.entrypoint = org.renpy.android.PythonActivity