From 0429ec4cfde636dd8dda3d1a0dcf6e175c821196 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 15 Mar 2015 11:01:15 +0100
Subject: Android: update makefile and backport language fix from master

---
 build/android/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/android/Makefile b/build/android/Makefile
index ef9376df3..f53f7f9f5 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
@@ -743,9 +744,13 @@ $(ROOT)/jni/src/android_version.h :
 	>> ${ROOT}/jni/src/android_version.h;                                      \
 	export GITHASH=$$(git rev-parse --short=8 HEAD);                           \
 	if [ "x$$GITHASH" = "x" ] ; then                                           \
-		export GITHASH=gUnknown;                                               \
+		export GITHASH="";                                                 \
 	fi;                                                                        \
-	echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\""                         \
+	export GITTAG=$$(git describe --abbrev=0 --tags);                          \
+	if [ "x$$GITTAG" = "x" ] ; then                                            \
+		export GITTAG="";                                                  \
+	fi;                                                                        \
+	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)"                                                   \
-- 
cgit v1.2.3