diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-24 09:41:39 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-24 09:48:44 -0800 |
| commit | 697bd94198bdb5e3f6238c38153ebdc8a2c38956 (patch) | |
| tree | 34424091c767e209c1289ab9a0767d847af20e91 | |
| parent | b87df3ecaa282cc0407510036b22fcecc908efaa (diff) | |
| download | subsurface-697bd94198bdb5e3f6238c38153ebdc8a2c38956.tar.gz | |
Android build: allow selecting Debug / Release build
And never build the tests. Makes no sense to do so when cross building for
Android.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/android/build.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 6248bf27f..9c248c0b4 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -6,6 +6,18 @@ PLATFORM=$(uname) pushd $(dirname $0)/../../ export SUBSURFACE_SOURCE=$PWD popd + +# is this a release or debug build +BUILD_TYPE=Debug +if [ "$1" = "release" ] || [ "$1" = "Release" ] ; then + shift + BUILD_TYPE=Release +fi +if [ "$1" = "debug" ] || [ "$1" = "Debug" ] ; then + # this is the default - still need to eat the argument if given + shift +fi + # Configure where we can find things here export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5 @@ -299,7 +311,8 @@ cmake $MOBILE_CMAKE \ -DNO_USERMANUAL=ON \ -DFBSUPPORT=OFF \ -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DMAKE_TESTS=OFF \ -DFTDISUPPORT=${FTDI} \ $SUBSURFACE_SOURCE make |