electrum

commit f777c9ee13df3dd0e7d248915747099cda88a95e
parent f412420892f581768bad357d080acae9594d9a4f
Author: SomberNight <somber.night@protonmail.com>
Date:   Fri,  3 Apr 2020 21:31:31 +0200

android build: update buildozer/p4a/NDK

- updated p4a pulls in newer openssl (old one is no longer available from openssl.org)
- old NDK no longer available (new one is what updated p4a recommends)

Diffstat:
M
electrum/gui/kivy/tools/Dockerfile
 | 
6
+++---
M
electrum/gui/kivy/tools/buildozer.spec
 | 
2
+-

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/electrum/gui/kivy/tools/Dockerfile b/electrum/gui/kivy/tools/Dockerfile
@@ -18,7 +18,7 @@ RUN apt -y update -qq \
 
 
 ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
-ENV ANDROID_NDK_VERSION="19b"
+ENV ANDROID_NDK_VERSION="19c"
 ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
 
 # get the latest version from https://developer.android.com/ndk/downloads/index.html
@@ -154,7 +154,7 @@ RUN cd /opt \
     && cd buildozer \
     && git remote add sombernight https://github.com/SomberNight/buildozer \
     && git fetch --all \
-    && git checkout 7578fea609d4445b3fed1f441813ab4c86ef0086 \
+    && git checkout cceab3c2ce4b2d2d621cf2fd18227024fc2d4bca \
     && python3 -m pip install --user -e .
 
 # install python-for-android
@@ -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 9162ec6b4af464672960f6f9bb7c481af2d01802 \
+    && git checkout 5ab509ad41e2e56026174dffcf280cf1d14d54ca \
     && 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
@@ -76,7 +76,7 @@ android.api = 28
 android.minapi = 21
 
 # (str) Android NDK version to use
-android.ndk = 19b
+android.ndk = 19c
 
 # (int) Android NDK API to use (optional). This is the minimum API your app will support.
 android.ndk_api = 21