jni: Revert dependency on CrystaX 10.1.0 and fixes for new versions of NFD and ndn-cxx
The new CrystaX release has (yet unknown) issue that prevents code from
working properly
Change-Id: I5c34dc12ea653c7b7ec694640b5d0ecd6648b1d5
diff --git a/.vagrant/Vagrantfile b/.vagrant/Vagrantfile
index f2d8374..58a6b30 100644
--- a/.vagrant/Vagrantfile
+++ b/.vagrant/Vagrantfile
@@ -10,9 +10,10 @@
sudo dpkg --add-architecture i386;
sudo apt-get update -qq; sudo apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386
-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
-rm crystax-ndk-10.2.1-linux-x86_64.tar.bz2
+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
+rm 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 http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz
tar zxf android-sdk_r24.0.2-linux.tgz
@@ -29,12 +30,12 @@
echo "y" | android update sdk --filter "android-19" --no-ui --all --force
wget -q https://services.gradle.org/distributions/gradle-2.6-bin.zip
-unzip gradle-2.6.bin.zip
+unzip gradle-2.6-bin.zip
rm gradle-2.6-bin.zip
export PATH=$PATH:`pwd`/gradle-2.6/bin
echo sdk.dir=`pwd`/android-sdk-linux > local.properties
-echo ndk.dir=`pwd`/crystax-ndk-10.2.1 >> local.properties
+echo ndk.dir=`pwd`/crystax-ndk-10.1.0 >> local.properties
SCRIPT
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|