commit 5473234f0135b753a74e0e5e6e1ab6c7de414acc
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Dec 02 16:34:25 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Dec 02 18:49:27 2015 -0800
tree 2c28e07f8375f47d58e9bd047efee70e25b5c102
parent 3b249ec43a7c0bcfc3c7ded9257c672d03214c97

jni+ci+build: Upgrade to use CrystaX 10.2.1

Change-Id: I7ddf71e970aefb44949aa24687ccb67552a4fd0d

.jenkins.d/10-get-ndk.sh

diff --git a/.jenkins.d/10-get-ndk.sh b/.jenkins.d/10-get-ndk.sh
index 5729869..07f1942 100755
--- a/.jenkins.d/10-get-ndk.sh
+++ b/.jenkins.d/10-get-ndk.sh
@@ -3,7 +3,7 @@
 set -x
 
 URL=https://www.crystax.net/download/
-NDK=crystax-ndk-10.1.0
+NDK=crystax-ndk-10.2.1
 
 NDK_FILE="$NDK-linux-x86_64.tar.bz2"
 
@@ -17,7 +17,6 @@
 if [ ! -d $NDK ]; then
     echo -en 'travis_fold:start:NDK\r'
     pv -f downloads/$NDK_FILE | tar xjf -
-    find $NDK -name byteswap.h -exec sed -i -e 's/ swap/ bswap/g' {} \;
     echo -en 'travis_fold:end:NDK\r'
 fi
 

.jenkins.d/10-get-sdk.sh

diff --git a/.jenkins.d/10-get-sdk.sh b/.jenkins.d/10-get-sdk.sh
index e17e09c..4b801dd 100644
--- a/.jenkins.d/10-get-sdk.sh
+++ b/.jenkins.d/10-get-sdk.sh
@@ -8,7 +8,7 @@
 
 export ANDROID_HOME=`pwd`/android-sdk-linux
 export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-export PATH=$PATH:`pwd`/gradle-2.2.1/bin
+export PATH=$PATH:`pwd`/gradle-2.9/bin
 
 if [ ! -d android-sdk-linux ]; then
     wget -q http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz
@@ -19,8 +19,8 @@
     echo "y" | android update sdk --filter "android-19" --no-ui --all --force
 fi
 
-wget -q https://services.gradle.org/distributions/gradle-2.2.1-bin.zip
-unzip gradle-2.2.1-bin.zip
-rm gradle-2.2.1-bin.zip
+wget -q https://services.gradle.org/distributions/gradle-2.9-bin.zip
+unzip gradle-2.9-bin.zip
+rm gradle-2.9-bin.zip
 
 echo sdk.dir=`pwd`/android-sdk-linux >> local.properties