mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Android: allow running android-build-wrapper without building
This way we can use it to fetch dependencies we need up front. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
691d44dfd1
commit
fa325aeca0
1 changed files with 21 additions and 0 deletions
|
@ -17,6 +17,23 @@ exec 1> >(tee ./build.log) 2>&1
|
|||
|
||||
USE_X=$(case $- in *x*) echo "-x" ;; esac)
|
||||
|
||||
# deal with the command line arguments
|
||||
while [[ $# -gt 0 ]] ; do
|
||||
arg="$1"
|
||||
case $arg in
|
||||
-prep-only)
|
||||
# only download the dependencies, don't build
|
||||
PREP_ONLY="1"
|
||||
;;
|
||||
*)
|
||||
echo "Unknown command line argument $arg"
|
||||
echo "Usage: $0 [-prep-only]"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
# these are the current versions for Qt, Android SDK & NDK:
|
||||
source subsurface/packaging/android/variables.sh
|
||||
|
||||
|
@ -111,6 +128,10 @@ fi
|
|||
# patch the cmake / Qt5.7.1 incompatibility mentioned above
|
||||
sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/"${LATEST_QT}"/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
|
||||
|
||||
if [ ! -z $PREP_ONLY ] ; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! -d subsurface/libdivecomputer/src ] ; then
|
||||
pushd subsurface
|
||||
git submodule init
|
||||
|
|
Loading…
Add table
Reference in a new issue