aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-11-09 20:43:37 +0800
committerGitHub <noreply@github.com>2017-11-09 20:43:37 +0800
commit3d88ecd61ae7b43f1227acafaec71e49093491b8 (patch)
tree90a39d711901a5aa4bfbaf237335124464d6da74
parentd7f2462e8f242887846cbff760790fa42c28de65 (diff)
parent09b347fec92d2a73122dc3efc5aeea2a2724d9ca (diff)
downloaddexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.tar
dexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.tar.gz
dexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.tar.bz2
dexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.tar.lz
dexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.tar.xz
dexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.tar.zst
dexon-3d88ecd61ae7b43f1227acafaec71e49093491b8.zip
Merge pull request #15448 from karalabe/android-build-fix
travis: bump Android NDK version and Android Go builder
-rw-r--r--.travis.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index fe3b04cd2..1bd69da34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -147,16 +147,16 @@ matrix:
- azure-android
- maven-android
before_install:
- - curl https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz | tar -xz
+ - curl https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz | tar -xz
- export PATH=`pwd`/go/bin:$PATH
- export GOROOT=`pwd`/go
- export GOPATH=$HOME/go
script:
# Build the Android archive and upload it to Maven Central and Azure
- - curl https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip -o android-ndk-r14b.zip
- - unzip -q android-ndk-r14b.zip && rm android-ndk-r14b.zip
- - mv android-ndk-r14b $HOME
- - export ANDROID_NDK=$HOME/android-ndk-r14b
+ - curl https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip -o android-ndk-r15c.zip
+ - unzip -q android-ndk-r15c.zip && rm android-ndk-r15c.zip
+ - mv android-ndk-r15c $HOME
+ - export ANDROID_NDK=$HOME/android-ndk-r15c
- mkdir -p $GOPATH/src/github.com/ethereum
- ln -s `pwd` $GOPATH/src/github.com/ethereum