From fa95a7c56aaeeeba9879552c85e1f85b0594d22c Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 14 May 2018 21:31:55 +0200 Subject: 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 --- packaging/android/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging') 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" -- cgit v1.2.3-70-g09d2