diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2018-06-28 12:13:35 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-04 13:11:21 -0700 |
| commit | b1de856595b72a9c1f5fa2b5a86d13a3eb4e48a3 (patch) | |
| tree | 99c9ff398c8f963ddf3d5d09c183a391c0001cf0 /packaging/android/build.sh | |
| parent | e6e9470f81315b9d8446b8a00b296050537826e7 (diff) | |
| download | subsurface-b1de856595b72a9c1f5fa2b5a86d13a3eb4e48a3.tar.gz | |
Update android build env.
Update the scripts used to build subsurface-mobile for
andriod to use the variables file.
Removed checks for obsolete Qt versions.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Diffstat (limited to 'packaging/android/build.sh')
| -rwxr-xr-x | packaging/android/build.sh | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index c2b902037..e7674bf84 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -38,8 +38,8 @@ BUILD_NR=0 SUBSURFACE_DESKTOP=OFF # Which arch should we build for? ARCH=arm -# Which SDK buildtools revision is used? -ANDROID_BUILDTOOLS_REVISION=25.0.3 +# Read build variables +source subsurface/packaging/android/variables.sh while [ "$#" -gt 0 ] ; do case "$1" in @@ -76,12 +76,12 @@ done export ARCH # Configure where we can find things here -export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14b} +export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../${ANDROID_NDK}} if [ -n "${QT5_ANDROID+X}" ] ; then echo "Using Qt5 in $QT5_ANDROID" -elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.10.1" ] ; then - export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.10.1 +elif [ -d "$SUBSURFACE_SOURCE/../Qt/${LATEST_QT}" ] ; then + export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/${LATEST_QT} elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.3" ] ; then export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9.3 elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9.1" ] ; then @@ -90,14 +90,8 @@ elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9" ] ; then export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9 elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.8" ] ; then export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.8 -elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.7" ] ; then - export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.7 -elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.6" ] ; then - export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.6 -elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.5" ] ; then - export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5 else - echo "Cannot find Qt 5.5 or newer under $SUBSURFACE_SOURCE/../Qt" + echo "Cannot find Qt 5.8 or newer under $SUBSURFACE_SOURCE/../Qt" exit 1 fi @@ -109,9 +103,6 @@ else export ANDROID_NDK_HOST=linux-x86_64 fi -# Which versions are we building against? -OPENSSL_VERSION=1.0.2l - if [ "$ARCH" = "arm" ] ; then QT_ARCH=armv7 BUILDCHAIN=arm-linux-androideabi |