From ad389dea1741b6adad1dc728a6400c0e1ddc1ad6 Mon Sep 17 00:00:00 2001
From: Dylan McCall <dylan@endlessos.org>
Date: Mon, 18 Apr 2022 14:57:41 -0700
Subject: [PATCH] Use variables to allow overriding build tools

In particular, this is useful for a situation where we want to use
podman instead of docker, or where adb is not in $PATH.
---
 Makefile             | 25 +++++++++++++++----------
 scripts/rundocker.sh |  3 ++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 121d476f..d5f61e14 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,11 @@ ANDROIDNDKVER := 21.4.7075529
 
 SDK := ${ANDROID_HOME}/android-sdk-$(PLATFORM)
 
+ADB := adb
+DOCKER := docker
+P4A := p4a
+PYTHON_FOR_ANDROID := python-for-android
+
 # This checks if an environment variable with a specific name
 # exists. If it doesn't, it prints an error message and exits.
 # For example to check for the presence of the ANDROIDSDK environment
@@ -41,9 +46,9 @@ clean:
 	- rm -rf dist/*.apk src/kolibri tmpenv
 
 deepclean: clean
-	python-for-android clean_dists
+	$(PYTHON_FOR_ANDROID) clean_dists
 	rm -r dist || true
-	yes y | docker system prune -a || true
+	yes y | $(DOCKER) system prune -a || true
 	rm build_docker 2> /dev/null
 
 .PHONY: clean-whl
@@ -68,7 +73,7 @@ src/kolibri: clean
 
 .PHONY: p4a_android_distro
 p4a_android_distro: needs-android-dirs
-	p4a create --arch=$(P4A_ARCH)
+	$(P4A) create --arch=$(P4A_ARCH)
 
 .PHONY: needs-version
 needs-version:
@@ -84,7 +89,7 @@ kolibri.apk: p4a_android_distro src/kolibri needs-version
 	$(MAKE) guard-P4A_RELEASE_KEYSTORE_PASSWD
 	$(MAKE) guard-P4A_RELEASE_KEYALIAS_PASSWD
 	@echo "--- :android: Build APK"
-	p4a apk --release --sign --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER)
+	$(P4A) apk --release --sign --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER)
 	mkdir -p dist
 	mv kolibri-release-$(APK_VERSION)-.apk dist/kolibri__$(ARM_VER)-$(APK_VERSION).apk
 
@@ -93,7 +98,7 @@ kolibri.apk: p4a_android_distro src/kolibri needs-version
 # For some reason, p4a defauls to adding a final '-' to the filename, so we remove it in the final step.
 kolibri.apk.unsigned: p4a_android_distro src/kolibri needs-version
 	@echo "--- :android: Build APK (unsigned)"
-	p4a apk --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER)
+	$(P4A) apk --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER)
 	mkdir -p dist
 	mv kolibri-debug-$(APK_VERSION)-.apk dist/kolibri__$(ARM_VER)-debug-$(APK_VERSION).apk
 
@@ -103,19 +108,19 @@ kolibri.apk.unsigned: p4a_android_distro src/kolibri needs-version
 # Makes dummy file
 .PHONY: build_docker
 build_docker: Dockerfile
-	docker build -t android_kolibri .
+	$(DOCKER) build -t android_kolibri .
 
 # Run the docker image.
 # TODO Would be better to just specify the file here?
 run_docker: build_docker
-	./scripts/rundocker.sh
+	env DOCKER="$(DOCKER)" ./scripts/rundocker.sh
 
 install:
-	adb uninstall org.learningequality.Kolibri || true 2> /dev/null
-	adb install dist/*$(ARM_VER)-debug-*.apk
+	$(ADB) uninstall org.learningequality.Kolibri || true 2> /dev/null
+	$(ADB) install dist/*$(ARM_VER)-debug-*.apk
 
 logcat:
-	adb logcat | grep -i -E "python|kolibr| `adb shell ps | grep ' org.learningequality.Kolibri$$' | tr -s [:space:] ' ' | cut -d' ' -f2` " | grep -E -v "WifiTrafficPoller|localhost:5000|NetworkManagementSocketTagger|No jobs to start"
+	$(ADB) logcat | grep -i -E "python|kolibr| `$(ADB) shell ps | grep ' org.learningequality.Kolibri$$' | tr -s [:space:] ' ' | cut -d' ' -f2` " | grep -E -v "WifiTrafficPoller|localhost:5000|NetworkManagementSocketTagger|No jobs to start"
 
 $(SDK)/cmdline-tools:
 	@echo "Downloading Android SDK build tools"
diff --git a/scripts/rundocker.sh b/scripts/rundocker.sh
index ca6325b2..71aacc5f 100755
--- a/scripts/rundocker.sh
+++ b/scripts/rundocker.sh
@@ -4,6 +4,7 @@ set -e
 
 SCRIPTDIR=$(realpath "$(dirname "$0")")
 SRCDIR=$(dirname "$SCRIPTDIR")
+DOCKER=${DOCKER:-"docker"}
 
 BUILD_CACHE_VOLUME="kolibri-android-cache-$ARCH"
 BUILD_CACHE_PATH=/cache
@@ -46,4 +47,4 @@ if [ -e "${P4A_RELEASE_KEYSTORE}" ]; then
   )
 fi
 
-exec docker run "${RUN_OPTS[@]}" android_kolibri "$@"
+exec "${DOCKER}" run "${RUN_OPTS[@]}" android_kolibri "$@"