diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2017-06-01 17:04:53 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-21 18:43:15 -0700 |
| commit | d97055d47c8c36381516f0bdb3697f895a7fc65b (patch) | |
| tree | b0e0455c75d6a7e4896e54d1b4ec4901dbcd9ccb /packaging/android | |
| parent | 2fa7e86708860e31d9011364df00e0c92f487241 (diff) | |
| download | subsurface-d97055d47c8c36381516f0bdb3697f895a7fc65b.tar.gz | |
Upgrade 3pp for android and testing
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/build.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 23f80c033..c08d8b5f3 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -39,7 +39,7 @@ SUBSURFACE_DESKTOP=OFF # Which arch should we build for? ARCH=arm # Which SDK buildtools revision is used? -ANDROID_BUILDTOOLS_REVISION=23.0.3 +ANDROID_BUILDTOOLS_REVISION=25.0.3 while [ "$#" -gt 0 ] ; do case "$1" in @@ -72,7 +72,7 @@ done export ARCH # Configure where we can find things here -export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r13b} +export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14b} if [ -n "${QT5_ANDROID+X}" ] ; then echo "Using Qt5 in $QT5_ANDROID" @@ -100,13 +100,13 @@ else fi # Which versions are we building against? -SQLITE_VERSION=3130000 +SQLITE_VERSION=3190200 LIBXML2_VERSION=2.9.4 LIBXSLT_VERSION=1.1.29 LIBZIP_VERSION=1.1.3 -LIBGIT2_VERSION=0.24.1 +LIBGIT2_VERSION=0.25.1 LIBUSB_VERSION=1.0.20 -OPENSSL_VERSION=1.0.2h +OPENSSL_VERSION=1.0.2l LIBFTDI_VERSION=1.3 if [ "$ARCH" = "arm" ] ; then @@ -144,7 +144,7 @@ else fi if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then - wget http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_VERSION}.tar.gz + wget http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_VERSION}.tar.gz fi if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz |