build+ci: Upgrade NDK dependency to crystax-10.2.1
As a result of the upgrade, sqlite3 module is no longer necessary, as it
is bundled with crystax NDK.
This commit also fixes compilation issue caused by jndn-util and
jndn-management dependency (both depend on "RELEASE" version of jndn-mock and
jndn-util library, causing compatibility problem).
Change-Id: Iabc70fdd899426a3e1b35c5f6f48202deaaf0043
diff --git a/README.md b/README.md
index 84c96f3..782b9b2 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.2.1-bin.zip
- unzip gradle-2.2.1-bin.zip
+ wget -q https://services.gradle.org/distributions/gradle-2.6-bin.zip
+ unzip gradle-2.6-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.2.1/bin/gradle assembleRelease
+ ../gradle/gradle-2.6/bin/gradle assembleRelease
## Setting up environment using Vagrant