From 81a242398257ac62930f8869d0fb9500ec90fed4 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sun, 3 Feb 2019 20:19:52 +0100 Subject: [PATCH] [Android, feat] Set APK version to a sane automated value (#4546) Includes "set android versionCode and android versionName at buildtime" () * versionCode uses the number of Git commits, because Google doesn't like values larger than `2100000000` * versionName uses our existing version string References #2040. --- Makefile | 6 +++++- platform/android/luajit-launcher | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fc9171760..e6046a571 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,10 @@ ifneq (,$(findstring -,$(VERSION))) VERSION:=$(VERSION)_$(shell git describe HEAD | xargs git show -s --format=format:"%cd" --date=short) endif +# Use the git commit count as the (integer) Android version code +ANDROID_VERSION?=$(git rev-list --count HEAD) +ANDROID_NAME?=$(VERSION) + # set PATH to find CC in managed toolchains ifeq ($(TARGET), android) PATH:=$(ANDROID_TOOLCHAIN)/bin:$(PATH) @@ -365,7 +369,7 @@ 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) $(if $(KODEBUG), debug, release) + $(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) ANDROID_VERSION=$(ANDROID_VERSION) ANDROID_NAME=$(ANDROID_NAME) cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \ koreader-android-$(MACHINE)-$(VERSION).apk diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher index c7371bcb5..8fd3ee71a 160000 --- a/platform/android/luajit-launcher +++ b/platform/android/luajit-launcher @@ -1 +1 @@ -Subproject commit c7371bcb50a0314e9ca93ea1eb1f1d7d48fbeaa7 +Subproject commit 8fd3ee71a4a235ffd0a5b0fd7f1b53a8c83cb6cd