mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: Don't re-clone subsurface in android-build-wrapper.sh

Browse source 
Just use the source tree you where called from instead.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2017-11-16 12:35:17 +01:00 committed by Dirk Hohndel
parent 65b825286c
commit c92a86f898
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packaging/android/android-build-wrapper.sh
View file

@ -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