From bb381a263a7a3e8d61f7e6c2352d6063399663ee Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Wed, 21 Apr 2021 17:53:17 +0200
Subject: [PATCH] android build: update p4a/buildozer to latest upstream

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:
https://github.com/SomberNight/python-for-android/commit/7a7d415d9065da7efed813974de8dad796c98462

Re commenting out `android.arch` in buildozer.spec, we are setting this
via the ENV VAR in make_apk.
---
 contrib/android/Dockerfile     | 8 ++++----
 contrib/android/buildozer.spec | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile
index b88a6acb5..3442e593b 100644
--- a/contrib/android/Dockerfile
+++ b/contrib/android/Dockerfile
@@ -160,8 +160,8 @@ RUN cd /opt \
     && cd buildozer \
     && git remote add sombernight https://github.com/SomberNight/buildozer \
     && git fetch --all \
-    # commit: from branch sombernight/202104_android_adaptiveicon
-    && git checkout "0ce292fabec299c78c8ffeaf42072ab879f29d8a^{commit}" \
+    # commit: from branch sombernight/electrum_20210421
+    && git checkout "c17ac3618334c9936253e8f5b88dce43dc4da75b^{commit}" \
     && python3 -m pip install --user -e .
 
 # install python-for-android
@@ -170,8 +170,8 @@ RUN cd /opt \
     && cd python-for-android \
     && git remote add sombernight https://github.com/SomberNight/python-for-android \
     && git fetch --all \
-    # commit: from branch sombernight/electrum_20200703
-    && git checkout "a4059599211a87af895d9ee2223f052a406357ca^{commit}" \
+    # commit: from branch sombernight/electrum_20210421
+    && git checkout "5356bc7838b03c8c174c91fe01539c91d1b40b9f^{commit}" \
     && python3 -m pip install --user -e .
 
 # build env vars
diff --git a/contrib/android/buildozer.spec b/contrib/android/buildozer.spec
index 05b66ce43..16bee6519 100644
--- a/contrib/android/buildozer.spec
+++ b/contrib/android/buildozer.spec
@@ -140,7 +140,7 @@ android.manifest.launch_mode = singleTask
 
 # (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
-android.arch = armeabi-v7a
+#android.arch = armeabi-v7a
 
 # (list) Android application meta-data to set (key=value format)
 #android.meta_data =
@@ -151,6 +151,8 @@ android.arch = armeabi-v7a
 
 android.whitelist = lib-dynload/_csv.so
 
+# (bool) enables Android auto backup feature (Android API >=23)
+android.allow_backup = False
 
 #
 # Python for android (p4a) specific