Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

[Android] Set flavor at build time

Browse Source
This commit is contained in:
Martín Fernández 2019-03-02 13:28:04 +01:00 committed by Frans de Jonge
parent 42346d8197
commit ae0861eda8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -352,7 +352,7 @@ androidupdate: all
cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=1 \ cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=1 \
../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \ ../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \
-x!resources/fonts -x!resources/icons/src -x!spec -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 \ cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \
koreader-android-$(MACHINE)-$(VERSION).apk koreader-android-$(MACHINE)-$(VERSION).apk

4
kodev
View File

@ -22,6 +22,10 @@ fi
NDKABI=${NDKABI:-14} NDKABI=${NDKABI:-14}
export NDKABI export NDKABI
# Default android flavor
ANDROID_FLAVOR=${ANDROID_FLAVOR:-rocks}
export ANDROID_FLAVOR
function assert_ret_zero() { function assert_ret_zero() {
if [ "${1}" -ne 0 ]; then if [ "${1}" -ne 0 ]; then
if [ -n "${2}" ]; then if [ -n "${2}" ]; then