Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: vagrant-provision.sh

Issue 29448564: Issue 5277 - Prepare Vagrant files for CI (Closed)
Patch Set: see the changes in commit message https://github.com/4ntoine/libadblockplus-android-ci/commit/d44b6f71a6efb02d46fb594e823c6e810ba79a4f Created May 25, 2017, 1:50 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « vagrant-mount-disk.sh ('k') | vagrant-test.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vagrant-provision.sh
diff --git a/vagrant-provision.sh b/vagrant-provision.sh
index a77779317d8ddbae3ce660384d63b0eaf5bc0f05..2f5d73482a18cd477093b840f103588db6f15a0c 100755
--- a/vagrant-provision.sh
+++ b/vagrant-provision.sh
@@ -4,9 +4,15 @@ set -e
# Enable i386 architecture for Android build-tools
dpkg --add-architecture i386
+# install JDK 8 from backports
+apt-get -y install software-properties-common
+add-apt-repository "deb http://http.debian.net/debian jessie-backports main"
apt-get -y update
+apt-get install -y -t jessie-backports openjdk-8-jdk
+# for x86 avr only
+#apt-get install -y kvm
# Git and Mercurial are needed for ./ensure_dependencies.py
-apt-get -y install ant maven openjdk-7-jdk git-core mercurial vim
+apt-get -y install git-core mercurial vim ca-certificates-java
# Install i386 libraries needed for Android build-tools
apt-get -y install libc6:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386
su vagrant <<-eoc
@@ -15,14 +21,33 @@ su vagrant <<-eoc
wget -q -O - https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz | tar xz
# Install NDK into ~
echo "Downloading Android NDK..."
- wget -q https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip
- unzip android-ndk*.zip
+ wget -q http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86.bin
+ echo "Extracting Android NDK..."
+ chmod +x android-ndk-r10c-linux-x86.bin
+ ./android-ndk-r10c-linux-x86.bin
mv android-ndk-*/ android-ndk-linux
+ rm ./android-ndk-r10c-linux-x86.bin
+ # Removing unused toolchains to save storage space
+ echo "Cleaning Android NDK toolchains..."
+ rm -rf android-ndk-linux/toolchains/mips64el-linux-android-clang3.4
+ rm -rf android-ndk-linux/toolchains/mipsel-linux-android-4.8
+ rm -rf android-ndk-linux/toolchains/mipsel-linux-android-clang3.4
+ rm -rf android-ndk-linux/toolchains/x86_64-clang3.4
+ rm -rf android-ndk-linux/toolchains/x86_64-clang3.5
+ rm -rf android-ndk-linux/toolchains/x86-clang3.4
+ rm -rf android-ndk-linux/toolchains/arm-linux-androideabi-4.8
+ rm -rf android-ndk-linux/toolchains/arm-linux-androideabi-clang3.4
+ rm -rf android-ndk-linux/toolchains/llvm-3.4
+ rm -rf android-ndk-linux/toolchains/llvm-3.5
+ rm -rf android-ndk-linux/toolchains/x86-4.8
+ rm -rf android-ndk-linux/toolchains/*-4.6
# Install Android dependencies
- echo "y" | android-sdk-linux/tools/android update sdk -u -a --filter platform-tools,android-16,extra-android-support,build-tools-23.0.2
+ echo "y" | android-sdk-linux/tools/android update sdk -u -a --filter platform-tools,extra-android-m2repository,android-16,android-21,build-tools-25.0.0
# Install emulator system images
- echo "y" | android-sdk-linux/tools/android update sdk -u -a --filter sys-img-armeabi-v7a-android-16
+ echo "y" | android-sdk-linux/tools/android update sdk -u -a --filter sys-img-armeabi-v7a-android-21
+ #echo "y" | android-sdk-linux/tools/android update sdk -u -a --filter sys-img-x86-android-21
# Create emulation device
- echo "no" | android-sdk-linux/tools/android create avd -n android-arm -t android-16 -b armeabi-v7a
+ echo "no" | android-sdk-linux/tools/android create avd -n avd-armeabi-v7a -t android-21 -b armeabi-v7a
+ #echo "no" | android-sdk-linux/tools/android create avd -n avd-x86 -t android-21 -b x86
eoc
« no previous file with comments | « vagrant-mount-disk.sh ('k') | vagrant-test.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld