[Android] Makefile: only use VERSION, not REVISION (#3811)

Fixes always reinstalling resource package.

See https://github.com/koreader/koreader/pull/3723#issuecomment-376508917
pull/3812/head
Frans de Jonge 6 years ago committed by GitHub
parent 3ead3f0da4
commit 6c3ace9940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -8,7 +8,6 @@ KOR_BASE?=base
# we want VERSION to carry the version of koreader, not koreader-base
VERSION:=$(shell git describe HEAD)
VERSION:=$(VERSION)_$(shell git describe HEAD | xargs git show -s --format=format:"%cd" --date=short)
REVISION=$(shell git rev-parse --short HEAD)
# set PATH to find CC in managed toolchains
ifeq ($(TARGET), android)
@ -320,7 +319,7 @@ androidupdate: all
-T ota/package.index --no-recursion
# make android update apk
cd $(INSTALL_DIR)/koreader && 7z a -l -mx=1 \
../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-g$(REVISION).7z * \
../../$(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 \

@ -1 +1 @@
Subproject commit 52a76c19e565ba42f0e5b438fd507f772886cfab
Subproject commit 132b24664a545e524039de193466b2c15d2a4a5b
Loading…
Cancel
Save