commit 652fb8eda4d859ec823d7b8444512e2e50e6e9d1
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 07 10:46:09 2017 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jul 17 15:39:22 2017 +0200
tree 03bdcf15031a2d7e5877a3cfab2a207940b42513
parent a2a340f69b683b5823043bb7729267ad8fbca26c

Upgrade instructions to use 16.04 slave and openjdk-8

Change-Id: I4ce3a4b3a89212b44e1bd4c9204f57f91a232304

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

diff --git a/.jenkins.d/10-get-sdk.sh b/.jenkins.d/10-get-sdk.sh
index d0810d9..87418ba 100755
--- a/.jenkins.d/10-get-sdk.sh
+++ b/.jenkins.d/10-get-sdk.sh
@@ -3,8 +3,8 @@
 set -x
 
 SDK_VERSION=24.4.1
-BUILD_TOOLS_VERSION=23.0.2
-COMPILE_SDK_VERSION=23
+BUILD_TOOLS_VERSION=26.0.0
+COMPILE_SDK_VERSION=26
 
 SDK=android-sdk-linux
 

.vagrant/Vagrantfile

diff --git a/.vagrant/Vagrantfile b/.vagrant/Vagrantfile
index fab8048..a5182c9 100644
--- a/.vagrant/Vagrantfile
+++ b/.vagrant/Vagrantfile
@@ -4,7 +4,6 @@
 VAGRANTFILE_API_VERSION = "2"
 
 $script = <<SCRIPT
-sudo apt-get update
 
 CRYSTAX_NDK_VERSION=10.3.1
 
@@ -12,8 +11,10 @@
 BUILD_TOOLS_VERSION=23.0.2
 COMPILE_SDK_VERSION=23
 
-sudo apt-get install -y build-essential git openjdk-7-jdk unzip
-sudo apt-get install -y lib32stdc++6 lib32z1 lib32z1-dev
+sudo apt -q update
+sudo apt -qy upgrade
+sudo apt install -y build-essential git openjdk-8-jdk unzip
+sudo apt install -y lib32stdc++6 lib32z1 lib32z1-dev
 
 wget -nv https://www.crystax.net/download/crystax-ndk-$CRYSTAX_NDK_VERSION-linux-x86_64.tar.xz
 tar xf crystax-ndk-$CRYSTAX_NDK_VERSION-linux-x86_64.tar.xz
@@ -39,7 +40,7 @@
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "boxcutter/ubuntu1604"
 
   config.vm.provision "shell", privileged: false, inline: $script
 

README.md

diff --git a/README.md b/README.md
index d3aabf7..5bf920e 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 - [CrystalX Android NDK](https://www.crystax.net/en/download) version 10.3.1
 - Prebuilt version of OpenSSL library
 
-Example script for Ubuntu 14.04 to get all dependencies, download SDK and NDK:
+Example script for Ubuntu 16.04 to get all dependencies, download SDK and NDK:
 
     CRYSTAX_NDK_VERSION=10.3.1
     SDK_VERSION=24.4.1
@@ -22,7 +22,9 @@
     BUILD_TOOLS_VERSION=23.0.2
     COMPILE_SDK_VERSION=23
 
-    sudo apt-get install -y build-essential git openjdk-7-jdk unzip
+    sudo apt -q update
+    sudo apt -qy upgrade
+    sudo apt-get install -y build-essential git openjdk-8-jdk unzip
     sudo apt-get install -y lib32stdc++6 lib32z1 lib32z1-dev
 
     wget https://www.crystax.net/download/crystax-ndk-$CRYSTAX_NDK_VERSION-linux-x86_64.tar.xz