commit da4f11dbd3650e0912db778ee645592719cea7b7 parent 8eb4247ac44d76e5c3d99c97dd9c4a3f0b91f0ef Author: ghost43 <somber.night@protonmail.com> Date: Tue, 13 Oct 2020 16:31:53 +0000 android build: update list of apt deps for buildozer (#6645) compare https://github.com/kivy/buildozer/blob/0.39/docs/source/installation.rst and https://github.com/kivy/buildozer/blob/1.2.0/docs/source/installation.rst Diffstat:
| M | contrib/android/Dockerfile | | | 51 | ++++++++++++++++++++++++++++++--------------------- |
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile @@ -92,29 +92,38 @@ ENV HOME_DIR="/home/${USER}" ENV WORK_DIR="${HOME_DIR}/wspace" \ PATH="${HOME_DIR}/.local/bin:${PATH}" -# install system dependencies +# install system/build dependencies +# https://github.com/kivy/buildozer/blob/master/docs/source/installation.rst#android-on-ubuntu-2004-64bit RUN apt -y update -qq \ && apt -y install -qq --no-install-recommends \ - python3 python3-pip python3-setuptools git wget lbzip2 patch sudo \ - software-properties-common libssl-dev \ - && apt -y autoremove - -# build dependencies -# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit -RUN dpkg --add-architecture i386 \ - && apt -y update -qq \ - && apt -y install -qq --no-install-recommends \ - build-essential ccache git python3 python3-dev \ - libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \ - libidn11:i386 \ - zip zlib1g-dev zlib1g:i386 \ - && apt -y autoremove \ - && apt -y clean - -# specific recipes dependencies (e.g. libffi requires autoreconf binary) -RUN apt -y update -qq \ - && apt -y install -qq --no-install-recommends \ - libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \ + python3 \ + python3-dev \ + python3-pip \ + python3-setuptools \ + wget \ + lbzip2 \ + patch \ + sudo \ + software-properties-common \ + git \ + zip \ + unzip \ + build-essential \ + ccache \ + openjdk-13-jdk \ + autoconf \ + libtool \ + pkg-config \ + zlib1g-dev \ + libncurses5-dev \ + libncursesw5-dev \ + libtinfo5 \ + cmake \ + libffi-dev \ + libssl-dev \ + automake \ + gettext \ + libltdl-dev \ && apt -y autoremove \ && apt -y clean