From c92a86f89832c5face68b94902dbd119a3b10860 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Thu, 16 Nov 2017 12:35:17 +0100 Subject: [PATCH] android: Don't re-clone subsurface in android-build-wrapper.sh Just use the source tree you where called from instead. Signed-off-by: Anton Lundin --- packaging/android/android-build-wrapper.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 36a690520..f7cde0f6c 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -94,14 +94,6 @@ if [ ! -d $ANDROID_SDK ] ; then popd fi -# ok, now we have Qt, SDK, and NDK - let's get us some Subsurface -if [ ! -d subsurface ] ; then - git clone https://github.com/Subsurface-divelog/subsurface.git -fi -pushd subsurface -git pull --rebase -popd - if [ ! -d libdivecomputer ] ; then git clone -b Subsurface-branch https://github.com/Subsurface-divelog/libdc.git libdivecomputer pushd libdivecomputer @@ -132,9 +124,9 @@ rm -f ./subsurface-mobile-build-arm/build/outputs/apk/*.apk rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml if [ "$USE_X" ] ; then - bash "$USE_X" subsurface/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" + bash "$USE_X" "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" else - bash subsurface/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" + bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm "$@" fi ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk