From 1dc3100ba3b179d395ce12a3a2cd07654f00716a Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 3 Apr 2020 22:27:02 +0200 Subject: [PATCH] android build: use "cryptography" instead of "pycryptodomex" fork Electrum needs either "cryptography" or "pycrytodomex" (since #6014). Previously we have been using a custom fork (of ours) of pycryptodomex, now let's just use upstream "cryptography". --- electrum/gui/kivy/tools/Dockerfile | 2 +- electrum/gui/kivy/tools/buildozer.spec | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/electrum/gui/kivy/tools/Dockerfile b/electrum/gui/kivy/tools/Dockerfile index c507d87f0..b92c1b3e0 100644 --- a/electrum/gui/kivy/tools/Dockerfile +++ b/electrum/gui/kivy/tools/Dockerfile @@ -163,7 +163,7 @@ RUN cd /opt \ && cd python-for-android \ && git remote add sombernight https://github.com/SomberNight/python-for-android \ && git fetch --all \ - && git checkout 5ab509ad41e2e56026174dffcf280cf1d14d54ca \ + && git checkout 690a8ecc8d1c7f446d42f53a89af06c9a2d00e4e \ && python3 -m pip install --user -e . # build env vars diff --git a/electrum/gui/kivy/tools/buildozer.spec b/electrum/gui/kivy/tools/buildozer.spec index 56ba11ed5..10fe62efb 100644 --- a/electrum/gui/kivy/tools/buildozer.spec +++ b/electrum/gui/kivy/tools/buildozer.spec @@ -23,9 +23,7 @@ source.exclude_dirs = bin, build, dist, contrib, electrum/tests, electrum/gui/qt, electrum/gui/kivy/tools, - electrum/gui/kivy/theming/light, - # exclude pycryptodomex built by make_packages; android needs custom version - packages/cryptodome + electrum/gui/kivy/theming/light # (list) List of exclusions using pattern matching source.exclude_patterns = Makefile,setup* @@ -46,7 +44,7 @@ requirements = kivy==39c17457bae91baf8fe710dc989791e45879f136, libffi, libsecp256k1, - pycryptodomex==bfc1cca093a7344c9ed2b7c34bc560db6dca662a + cryptography # (str) Presplash of the application #presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png