LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-30 08:51:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

android build: use "cryptography" instead of "pycryptodomex" fork

Browse source 
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".
This commit is contained in:
SomberNight 2020-04-03 22:27:02 +02:00
parent f777c9ee13
commit 1dc3100ba3
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum/gui/kivy/tools/Dockerfile
View file

@ -163,7 +163,7 @@ 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 \
&& git checkout 5ab509ad41e2e56026174dffcf280cf1d14d54ca \ && git checkout 690a8ecc8d1c7f446d42f53a89af06c9a2d00e4e \
&& python3 -m pip install --user -e . && python3 -m pip install --user -e .
# build env vars # build env vars

6
electrum/gui/kivy/tools/buildozer.spec
View file

@ -23,9 +23,7 @@ source.exclude_dirs = bin, build, dist, contrib,
electrum/tests, electrum/tests,
electrum/gui/qt, electrum/gui/qt,
electrum/gui/kivy/tools, electrum/gui/kivy/tools,
electrum/gui/kivy/theming/light, electrum/gui/kivy/theming/light
# exclude pycryptodomex built by make_packages; android needs custom version
packages/cryptodome
# (list) List of exclusions using pattern matching # (list) List of exclusions using pattern matching
source.exclude_patterns = Makefile,setup* source.exclude_patterns = Makefile,setup*
@ -46,7 +44,7 @@ requirements =
kivy==39c17457bae91baf8fe710dc989791e45879f136, kivy==39c17457bae91baf8fe710dc989791e45879f136,
libffi, libffi,
libsecp256k1, libsecp256k1,
pycryptodomex==bfc1cca093a7344c9ed2b7c34bc560db6dca662a cryptography
# (str) Presplash of the application # (str) Presplash of the application
#presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png #presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png