diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-06 20:47:20 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-12-06 20:47:20 -0800 |
| commit | 7388a8120a035cebbda2d4de5db7e6f7a19a609f (patch) | |
| tree | 18b605f5348aef51a477e3c4583cbfec7138a1ac | |
| parent | 9434c36b7f2754a0eb407e31a8c5bf3255c5402d (diff) | |
| download | subsurface-7388a8120a035cebbda2d4de5db7e6f7a19a609f.tar.gz | |
Android build: fix android-build-wrapper.sh
I clearly had forgotten to update the Android specific scripts when
adding the libdivecomputer submodule.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index f7cde0f6c..b5a34d47e 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -94,20 +94,19 @@ if [ ! -d $ANDROID_SDK ] ; then popd fi -if [ ! -d libdivecomputer ] ; then - git clone -b Subsurface-branch https://github.com/Subsurface-divelog/libdc.git libdivecomputer - pushd libdivecomputer +if [ ! -d subsurface/libdivecomputer/src ] ; then + pushd subsurface + git submodule init + git submodule update --recursive + popd +fi + +if [ ! -f subsurface/libdivecomputer/configure ] ; then + pushd subsurface/libdivecomputer autoreconf --install autoreconf --install popd fi -pushd libdivecomputer -git pull --rebase -if ! git checkout Subsurface-branch ; then - echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up" - exit 1 -fi -popd # and now we need a monotonic build number... if [ ! -f ./buildnr.dat ] ; then |