diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2016-06-23 22:56:28 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-06-23 16:32:49 -0700 |
| commit | f28dfce50f16eed6d7e5fb5d3d513b1433c5a052 (patch) | |
| tree | b0c897c9aac41323447b9b69613fdddba5f9f734 /packaging | |
| parent | f3cde0357f66ad07f6bbb7933cc0e4e3539fd910 (diff) | |
| download | subsurface-f28dfce50f16eed6d7e5fb5d3d513b1433c5a052.tar.gz | |
android: Update to latest NDK
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index bd24f18de..ff5843043 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -27,7 +27,7 @@ else fi # Configure where we can find things here -export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r10e +export ANDROID_NDK_ROOT=$SUBSURFACE_SOURCE/../android-ndk-r12 if [ -d "$SUBSURFACE_SOURCE/../Qt/5.5" ] ; then export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5 @@ -80,7 +80,7 @@ fi export QT5_ANDROID_BIN=${QT5_ANDROID}/android_${QT_ARCH}/bin if [ ! -e ndk-$ARCH ] ; then - $ANDROID_NDK_ROOT/build/tools/make-standalone-toolchain.sh --arch=$ARCH --install-dir=ndk-$ARCH --platform=android-14 + $ANDROID_NDK_ROOT/build/tools/make_standalone_toolchain.py --arch=$ARCH --install-dir=ndk-$ARCH --api=14 fi export BUILDROOT=$PWD export PATH=${BUILDROOT}/ndk-$ARCH/bin:$PATH |