From 634a647fb12811a18d90a5da5721610a7c55a5d0 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 6 Mar 2022 19:27:30 +0100 Subject: [PATCH] android: parameterize GUI framework --- contrib/android/Makefile | 1 - contrib/android/make_apk | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/android/Makefile b/contrib/android/Makefile index f9c11491f..1dcf7ecf4 100644 --- a/contrib/android/Makefile +++ b/contrib/android/Makefile @@ -28,7 +28,6 @@ theming: #$(PYTHON) -m kivy.atlas ../../electrum/gui/kivy/theming/atlas/light 1024 ../../electrum/gui/kivy/theming/light/*.png prepare: # running pre build setup - @cp buildozer_qml.spec ../../buildozer.spec # copy electrum to main.py @cp buildozer_$(ELEC_APK_GUI).spec ../../buildozer.spec @cp ../../run_electrum ../../main.py diff --git a/contrib/android/make_apk b/contrib/android/make_apk index d87265333..f8c11665a 100755 --- a/contrib/android/make_apk +++ b/contrib/android/make_apk @@ -8,6 +8,9 @@ PROJECT_ROOT="$CONTRIB"/.. PACKAGES="$PROJECT_ROOT"/packages/ LOCALE="$PROJECT_ROOT"/electrum/locale/ +# qml or kivy +export ELEC_APK_GUI=qml + . "$CONTRIB"/build_tools_util.sh