aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/android
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/android')
-rw-r--r--packaging/android/build.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 3ca68eb2d..788e00231 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -355,10 +355,13 @@ cmake $MOBILE_CMAKE \
sed -i -e "s/-lcrypto//g" CMakeFiles/subsurface-mobile.dir/link.txt
# set up the version number
-SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | awk "{ print \$3 }" )
+
+SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \" )
+SUBSURFACE_MOBILE_VERSION="${SUBSURFACE_MOBILE_VERSION} ($(grep CANONICAL_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \"))"
+
rm -rf android-mobile
cp -a $SUBSURFACE_SOURCE/android-mobile .
-sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/$SUBSURFACE_MOBILE_VERSION/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml
+sed -i -e "s/@SUBSURFACE_MOBILE_VERSION@/\"$SUBSURFACE_MOBILE_VERSION\"/;s/@BUILD_NR@/$BUILD_NR/" android-mobile/AndroidManifest.xml
# now build Subsurface and use the rest of the command line arguments
make $@