From ae0861eda8f5c9db271966b586212c07601106da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= Date: Sat, 2 Mar 2019 13:28:04 +0100 Subject: [PATCH] [Android] Set flavor at build time --- Makefile | 2 +- kodev | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 73535628d..43dd8ff2b 100644 --- a/Makefile +++ b/Makefile @@ -352,7 +352,7 @@ androidupdate: all cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=1 \ ../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \ -x!resources/fonts -x!resources/icons/src -x!spec - $(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) ANDROID_VERSION=$(ANDROID_VERSION) ANDROID_NAME=$(ANDROID_NAME) + $(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) ANDROID_VERSION=$(ANDROID_VERSION) ANDROID_NAME=$(ANDROID_NAME) ANDROID_FLAVOR=$(ANDROID_FLAVOR) cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \ koreader-android-$(MACHINE)-$(VERSION).apk diff --git a/kodev b/kodev index 1476a1faf..71089a200 100755 --- a/kodev +++ b/kodev @@ -22,6 +22,10 @@ fi NDKABI=${NDKABI:-14} export NDKABI +# Default android flavor +ANDROID_FLAVOR=${ANDROID_FLAVOR:-rocks} +export ANDROID_FLAVOR + function assert_ret_zero() { if [ "${1}" -ne 0 ]; then if [ -n "${2}" ]; then