From 2bc0165652ec9244081f7c0db28c8d9c81b5d308 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 15 Mar 2015 11:21:34 +0100
Subject: [PATCH] Android Makefile update backported from stable-0.4 with minor
changes
---
build/android/Makefile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/build/android/Makefile b/build/android/Makefile
index 785ba3e7e..1c5b5628b 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -26,7 +26,8 @@ GAMES_TO_COPY = minetest_game
# Android Version code
# Increase for each build!
################################################################################
-ANDROID_VERSION_CODE = 10
+# Play Store actual version (15/03/15): 10
+ANDROID_VERSION_CODE = 11
################################################################################
# toolchain config for arm old processors
@@ -742,10 +743,8 @@ $(ROOT)/jni/src/android_version.h :
grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \
>> ${ROOT}/jni/src/android_version.h; \
export GITHASH=$$(git rev-parse --short=8 HEAD); \
- if [ "x$$GITHASH" = "x" ] ; then \
- export GITHASH=gUnknown; \
- fi; \
- echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\"" \
+ export GITTAG=$$(git describe --abbrev=0 --tags); \
+ echo "#define CMAKE_VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
\".\"STR(VERSION_PATCH)" \
--
GitLab