8000 android build: update p4a, buildozer, base ubuntu · namecoin/electrum-nmc@980fb46 · GitHub
[go: up one dir, main page]
Skip to content

Commit 980fb46

Browse files
SomberNightJeremyRand
SomberNight
authored and
JeremyRand
committed
android build: update p4a, buildozer, base ubuntu
also, pull in upstream p4a dockerfile changes kivy/python-for-android#2231 kivy/python-for-android#2218
1 parent 849bca1 commit 980fb46

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

‎contrib/android/Dockerfile

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# based on https://github.com/kivy/python-for-android/blob/master/Dockerfile
22

3-
8000 FROM ubuntu:18.04
3+
FROM ubuntu:20.04
4+
5+
ENV DEBIAN_FRONTEND=noninteractive
46

57
ENV ANDROID_HOME="/opt/android"
68

@@ -38,10 +40,11 @@ RUN curl --location --progress-bar \
3840
ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
3941

4042
# get the latest version from https://developer.android.com/studio/index.html
41-
ENV ANDROID_SDK_TOOLS_VERSION="4333796"
42-
ENV ANDROID_SDK_BUILD_TOOLS_VERSION="28.0.3"
43-
ENV ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
43+
ENV ANDROID_SDK_TOOLS_VERSION="6514223"
44+
ENV ANDROID_SDK_BUILD_TOOLS_VERSION="29.0.3"
45+
ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip"
4446
ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
47+
ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}"
4548

4649
# download and install Android SDK
4750
RUN curl --location --progress-bar \
@@ -58,15 +61,15 @@ RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
5861

5962
# accept Android licenses (JDK necessary!)
6063
RUN apt -y update -qq \
61-
&& apt -y install -qq --no-install-recommends openjdk-8-jdk \
64+
&& apt -y install -qq --no-install-recommends openjdk-13-jdk \
6265
&& apt -y autoremove
63-
RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses > /dev/null
66+
RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
6467

6568
# download platforms, API, build tools
66-
RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-24" > /dev/null && \
67-
"${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-28" > /dev/null && \
68-
"${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \
69-
"${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "extras;android;m2repository" > /dev/null && \
69+
RUN ${ANDROID_SDK_MANAGER} "platforms;android-24" > /dev/null && \
70+
${ANDROID_SDK_MANAGER} "platforms;android-28" > /dev/null && \
71+
${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \
72+
${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null && \
7073
chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
7174

7275
# download ANT
@@ -96,27 +99,18 @@ RUN apt -y update -qq \
9699
software-properties-common libssl-dev \
97100
&& apt -y autoremove
98101

99-
# install kivy
100-
RUN add-apt-repository ppa:kivy-team/kivy \
101-
&& apt -y update -qq \
102-
&& apt -y install -qq --no-install-recommends python3-kivy \
103-
&& apt -y autoremove \
104-
&& apt -y clean
105-
106102
# build dependencies
107103
# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
108104
RUN dpkg --add-architecture i386 \
109105
&& apt -y update -qq \
110106
&& apt -y install -qq --no-install-recommends \
111107
build-essential ccache git python3 python3-dev \
112108
libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
113-
libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
109+
libidn11:i386 \
114110
zip zlib1g-dev zlib1g:i386 \
115111
&& apt -y autoremove \
116112
&& apt -y clean
117113

118-
RUN python3 -m pip install image
119-
120114
# specific recipes dependencies (e.g. libffi requires autoreconf binary)
121115
RUN apt -y update -qq \
122116
&& apt -y install -qq --no-install-recommends \
@@ -141,9 +135,11 @@ RUN chown ${USER} /opt
141135
USER ${USER}
142136

143137

144-
RUN python3 -m pip install --upgrade cython==0.28.6
145-
RUN python3 -m pip install --upgrade pip
146-
RUN python3 -m pip install --user wheel
138+
RUN python3 -m pip install --user --upgrade pip
139+
RUN python3 -m pip install --user --upgrade wheel
140+
RUN python3 -m pip install --user --upgrade cython==0.29.19
141+
RUN python3 -m pip install --user --pre kivy
142+
RUN python3 -m pip install --user image
147143

148144
# prepare git
149145
RUN git config --global user.name "John Doe" \
@@ -155,7 +151,7 @@ RUN cd /opt \
155151
&& cd buildozer \
156152
&& git remote add sombernight https://github.com/SomberNight/buildozer \
157153
&& git fetch --all \
158-
&& git checkout "d0323c165dd5d9aa23d5eb01044474fe006c3420^{commit}" \
154+
&& git checkout "94cfcb8d591c11d6ad0e11f129b08c1e27a161c5^{commit}" \
159155
&& python3 -m pip install --user -e .
160156

161157
# install python-for-android
@@ -164,7 +160,7 @@ RUN cd /opt \
164160
&& cd python-for-android \
165161
&& git remote add sombernight https://github.com/SomberNight/python-for-android \
166162
&& git fetch --all \
167-
&& git checkout "cef08b92268fe69ef331699c2205cbb091e730f0^{commit}" \
163+
&& git checkout "257cfacbdd523af0b5b6bb5b2ba64ab7a5c82d58^{commit}" \
168164
&& python3 -m pip install --user -e .
169165

170166
# build env vars

‎contrib/android/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ folder.
6363
## FAQ
6464
6565
### I changed something but I don't see any differences on the phone. What did I do wrong?
66-
You probably need to clear the cache: `rm -rf .buildozer/android/platform/build/{build,dists}`
66+
You probably need to clear the cache: `rm -rf .buildozer/android/platform/build-*/{build,dists}`
6767
6868
6969
### How do I deploy on connected phone for quick testing?

0 commit comments

Comments
 (0)
0