AaronFiore/electrum
1
0
Fork 0
Code Activity

android build: update p4a/buildozer to latest upstream

Browse Source 
Rebased our branches on latest p4a develop HEAD and buildozer master HEAD.

Re `android.allow_backup = False` in buildozer.spec, now that this setting
has been exposed to buildozer.spec (see https://github.com/kivy/buildozer/pull/1206),
we could finally drop a commit from our branch that did the same:
7a7d415d90

Re commenting out `android.arch` in buildozer.spec, we are setting this
via the ENV VAR in make_apk.
This commit is contained in:
SomberNight
2021-04-21 17:53:17 +02:00
parent 8ce94248d4
commit bb381a263a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/android/Dockerfile
View File

@@ -160,8 +160,8 @@ RUN cd /opt \
&& cd buildozer \ && cd buildozer \
&& git remote add sombernight https://github.com/SomberNight/buildozer \ && git remote add sombernight https://github.com/SomberNight/buildozer \
&& git fetch --all \ && git fetch --all \
# commit: from branch sombernight/202104_android_adaptiveicon # commit: from branch sombernight/electrum_20210421
&& git checkout "0ce292fabec299c78c8ffeaf42072ab879f29d8a^{commit}" \ && git checkout "c17ac3618334c9936253e8f5b88dce43dc4da75b^{commit}" \
&& python3 -m pip install --user -e . && python3 -m pip install --user -e .
# install python-for-android # install python-for-android
@@ -170,8 +170,8 @@ RUN cd /opt \
&& cd python-for-android \ && cd python-for-android \
&& git remote add sombernight https://github.com/SomberNight/python-for-android \ && git remote add sombernight https://github.com/SomberNight/python-for-android \
&& git fetch --all \ && git fetch --all \
# commit: from branch sombernight/electrum_20200703 # commit: from branch sombernight/electrum_20210421
&& git checkout "a4059599211a87af895d9ee2223f052a406357ca^{commit}" \ && git checkout "5356bc7838b03c8c174c91fe01539c91d1b40b9f^{commit}" \
&& python3 -m pip install --user -e . && python3 -m pip install --user -e .
# build env vars # build env vars

4
contrib/android/buildozer.spec
View File

@@ -140,7 +140,7 @@ android.manifest.launch_mode = singleTask
# (str) The Android arch to build for, choices: armeabi-v7a, arm64-v8a, x86, x86_64 # (str) The Android arch to build for, choices: armeabi-v7a, arm64-v8a, x86, x86_64
# note: can be overwritten by APP_ANDROID_ARCH env var # note: can be overwritten by APP_ANDROID_ARCH env var
android.arch = armeabi-v7a #android.arch = armeabi-v7a
# (list) Android application meta-data to set (key=value format) # (list) Android application meta-data to set (key=value format)
#android.meta_data = #android.meta_data =
@@ -151,6 +151,8 @@ android.arch = armeabi-v7a
android.whitelist = lib-dynload/_csv.so android.whitelist = lib-dynload/_csv.so
# (bool) enables Android auto backup feature (Android API >=23)
android.allow_backup = False
# #
# Python for android (p4a) specific # Python for android (p4a) specific