summaryrefslogtreecommitdiffstats
path: root/packaging/android/build.sh
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2018-05-14 21:31:55 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-17 07:36:44 -0700
commitfa95a7c56aaeeeba9879552c85e1f85b0594d22c (patch)
treeec476c980a571d6bb65428980fd2b33e5044d1b3 /packaging/android/build.sh
parent346bb9f31fb843515166e664629bdd128d23c722 (diff)
downloadsubsurface-fa95a7c56aaeeeba9879552c85e1f85b0594d22c.tar.gz
android-build: Use subsurface source variable
We already have a variable pointing to the source dir for subsurface, so use it. This way we can build out of tree, in any directory. Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'packaging/android/build.sh')
-rwxr-xr-xpackaging/android/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index f577598f2..4cc29e8df 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -368,10 +368,10 @@ fi
if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then
echo "" > libdivecomputer-${ARCH}.SHA
fi
-pushd subsurface
+pushd "$SUBSURFACE_SOURCE"
git submodule update --recursive
popd
-CURRENT_SHA=$(cd subsurface/libdivecomputer ; git describe)
+CURRENT_SHA=$(cd "$SUBSURFACE_SOURCE"/libdivecomputer ; git describe)
PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA)
if [[ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" || ! -e "$PKG_CONFIG_LIBDIR/libdivecomputer.pc" ]] ; then
mkdir -p libdivecomputer-build-"$ARCH"