From b68cdc202ddf2a57648938bbe735dc27f42e7897 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Thu, 31 Jan 2019 17:34:13 +0100
Subject: [PATCH] [Android] Add release/debug APK switch (#4532)

References #2040.

Includes https://github.com/koreader/android-luajit-launcher/pull/99
---
 Makefile                         | 4 ++--
 platform/android/luajit-launcher | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5ba5ff4ba..fc9171760 100644
--- a/Makefile
+++ b/Makefile
@@ -365,8 +365,8 @@ androidupdate: all
 	cd $(INSTALL_DIR)/koreader && 7z a -l -mx=1 \
 		../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \
 		-x!resources/fonts -x!resources/icons/src -x!spec
-	$(MAKE) -C $(ANDROID_LAUNCHER_DIR) apk
-	cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity-debug.apk \
+	$(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release)
+	cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \
 		koreader-android-$(MACHINE)-$(VERSION).apk
 
 debianupdate: all
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 66af56c35..00144b1c7 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 66af56c35d32b9c5bd96e97732dd80c1490da481
+Subproject commit 00144b1c789dea97fbb5623eeea4937d2c178abc