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

README.md

diff --git a/README.md b/README.md
index fbd99b4..a0f1816 100644
--- a/README.md
+++ b/README.md
@@ -8,18 +8,13 @@
 To compile code, the following is necessary
 
 - Appropriate [Android SDK](http://developer.android.com/sdk/index.html)
-- [CrystalX Android NDK](https://www.crystax.net/en/download) version 10.1.0 or later
-
-If version 10.1.0 is used, then the following patch needs to be applied:
-
-    find crystax-ndk-10.1.0 -name byteswap.h -exec sed -i -e 's/ swap/ bswap/g' {} \;
+- [CrystalX Android NDK](https://www.crystax.net/en/download) version 10.2.1 or later
 
 Example script for Ubuntu 14.04 to get all dependencies, download SDK and NDK:
 
     sudo apt-get install -y build-essential git openjdk-7-jdk unzip
-    wget -q https://www.crystax.net/download/crystax-ndk-10.1.0-linux-x86_64.tar.bz2
-    tar jxf crystax-ndk-10.1.0-linux-x86_64.tar.bz2
-    find crystax-ndk-10.1.0 -name byteswap.h -exec sed -i -e 's/ swap/ bswap/g' {} \;
+    wget -q https://www.crystax.net/download/crystax-ndk-10.2.1-linux-x86_64.tar.bz2
+    tar jxf crystax-ndk-10.2.1-linux-x86_64.tar.bz2
 
     wget -q http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz
     tar zxf android-sdk_r24.0.2-linux.tgz
@@ -27,8 +22,8 @@
 
     echo y |  ./android-sdk-linux/tools/android update sdk -a -u -t "android-19"
 
-    wget -q https://services.gradle.org/distributions/gradle-2.6-bin.zip
-    unzip gradle-2.6-bin.zip
+    wget -q https://services.gradle.org/distributions/gradle-2.9-bin.zip
+    unzip gradle-2.9-bin.zip
 
     SDK_TOOLS_VERSION=24.0.2
     BUILD_TOOLS_VERSION=21.1.2
@@ -48,10 +43,10 @@
 
     git clone --recursive http://gerrit.named-data.net/NFD-android
     echo sdk.dir=`pwd`/android-sdk-linux > NFD-android/local.properties
-    echo ndk.dir=`pwd`/crystax-ndk-10.1.0 >> NFD-android/local.properties
+    echo ndk.dir=`pwd`/crystax-ndk-10.2.1 >> NFD-android/local.properties
     cd NFD-android
 
-    ../gradle/gradle-2.6/bin/gradle assembleRelease
+    ../gradle/gradle-2.9/bin/gradle assembleRelease
 
 
 ## Setting up environment using Vagrant