From 3cad1159fe39530af7841aac2a07bec35e65a585 Mon Sep 17 00:00:00 2001
From: dalijolijo <david.bergen@gmx.net>
Date: Sat, 15 Jun 2019 22:38:19 +0000
Subject: [PATCH] Fix permission errors during android build

---
 contrib/make_apk                   | 3 +++
 electrum/gui/kivy/tools/Dockerfile | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/contrib/make_apk b/contrib/make_apk
index d6d48d73e..c6598538e 100755
--- a/contrib/make_apk
+++ b/contrib/make_apk
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -x
 set -e
 
 CONTRIB="$(dirname "$(readlink -e "$0")")"
@@ -7,6 +8,8 @@ ROOT_FOLDER="$CONTRIB"/..
 PACKAGES="$ROOT_FOLDER"/packages/
 LOCALE="$ROOT_FOLDER"/electrum/locale/
 
+sudo chown --recursive user .
+
 if [ ! -d "$LOCALE" ]; then
   echo "Run pull_locale first!"
   exit 1
diff --git a/electrum/gui/kivy/tools/Dockerfile b/electrum/gui/kivy/tools/Dockerfile
index 13ec31d41..47de24d7b 100644
--- a/electrum/gui/kivy/tools/Dockerfile
+++ b/electrum/gui/kivy/tools/Dockerfile
@@ -141,6 +141,8 @@ RUN cd /opt \
     && git checkout 678b1bf52cf63daa51b06e86a43ea4e2ea8a0b24 \
     && python3 -m pip install --user -e .
 
+RUN chown --recursive ${USER} /opt/buildozer
+
 # install python-for-android
 RUN cd /opt \
     && git clone https://github.com/kivy/python-for-android \
@@ -156,6 +158,8 @@ RUN cd /opt \
     && git cherry-pick aaa0d5d0e7a334631df71e0a9bf127817e0ab9ab \
     && python3 -m pip install --user -e .
 
+RUN chown --recursive ${USER} /opt/python-for-android
+
 # build env vars
 ENV USE_SDK_WRAPPER=1
 ENV GRADLE_OPTS="-Xmx1536M -Dorg.gradle.jvmargs='-Xmx1536M'"