[Android] Set flavor at build time

5 years ago · ae0861eda8
parent 42346d8197
commit ae0861eda8
2 changed files with 5 additions and 1 deletions
--- a/2
+++ b/2
@ -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

--- a/4
+++ b/4
@ -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