From d38f6ebb9bb9ff201b3a1e19a8e6ad311dbe4972 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Wed, 16 Jul 2014 20:01:00 +0200
Subject: Fix error handling on inconsistent client ready message Fix android
 makefile to provide a correct dummy githash if detection fails

---
 build/android/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'build/android/Makefile')

diff --git a/build/android/Makefile b/build/android/Makefile
index 38a3cbb0e..6528e839c 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -691,7 +691,11 @@ $(ROOT)/jni/src/android_version.h :
 	echo "#define VERSION_PATCH_ORIG $$(cat ${ROOT}/../../CMakeLists.txt |     \
 	grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')"            \
 	>> ${ROOT}/jni/src/android_version.h;                                      \
-	echo "#define CMAKE_VERSION_GITHASH \"$$(git rev-parse --short=8 HEAD)\""  \
+	export GITHASH=$$(git rev-parse --short=8 HEAD);                           \
+	if [ "x$$GITHASH" = "x" ] ; then                                           \
+		export GITHASH=gUnknown;                                               \
+	fi;                                                                        \
+	echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\""                         \
 	>> ${ROOT}/jni/src/android_version.h;                                      \
 	echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
 	\".\"STR(VERSION_PATCH)"                                                   \
-- 
cgit v1.2.3