Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Simplify Vagrant script 

Move functionality to install NDK and download curl and openssl sources to CI script that are already presented there.

This fixes #3119

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2019-05-11 02:47:12 +03:00
parent 6d8c802c06
commit caf75a68e2
No known key found for this signature in database
GPG Key ID: CE0DB1726070A5A3
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/Vagrantfile vendored
View File

@ -116,7 +116,7 @@ Vagrant.configure("2") do |config|
apt-get --assume-yes update
apt-get --assume-yes dist-upgrade -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --allow-downgrades --allow-remove-essential --allow-change-held-packages
apt-get --assume-yes install lubuntu-core virtualbox-guest-x11
apt-get --assume-yes install ubuntu-make git automake libtool pkg-config
apt-get --assume-yes install ubuntu-make git automake libtool pkg-config unzip
update-locale LC_ALL=en_US.UTF-8
SHELL
@ -127,8 +127,6 @@ Vagrant.configure("2") do |config|
umake --verbose android android-studio --accept-license $HOME/Android/Android-Studio
printf "\n# umake fix-up\nexport ANDROID_HOME=\$HOME/Android/Sdk\n" >> $HOME/.profile
umake --verbose android android-sdk --accept-license $HOME/Android/Sdk
printf "\n# umake fix-up\nexport NDK_ROOT=\$HOME/Android/Ndk\n" >> $HOME/.profile
umake --verbose android android-ndk --accept-license $HOME/Android/Ndk
yes | $HOME/Android/Sdk/tools/bin/sdkmanager --update
yes | $HOME/Android/Sdk/tools/bin/sdkmanager "extras;android;m2repository" "extras;google;m2repository"
mkdir $HOME/Desktop
@ -141,21 +139,12 @@ Vagrant.configure("2") do |config|
s.name = "Cloning BOINC repository and configuring toolchain..."
s.privileged = false
s.inline = <<-SHELL
export OPENSSL_VERSION=1.0.2q
export CURL_VERSION=7.62.0
git clone https://github.com/BOINC/boinc.git $HOME/BOINC
export BUILD_TOOLS=`sed -n "s/.*buildToolsVersion\\s*\\"\\(.*\\)\\"/\\1/p" $HOME/BOINC/android/BOINC/app/build.gradle`
export COMPILE_SDK=`sed -n "s/.*compileSdkVersion\\s*\\(\\d*\\)/\\1/p" $HOME/BOINC/android/BOINC/app/build.gradle`
yes | $HOME/Android/Sdk/tools/bin/sdkmanager "build-tools;${BUILD_TOOLS}"
yes | $HOME/Android/Sdk/tools/bin/sdkmanager "platforms;android-${COMPILE_SDK}"
printf "\n# Build toolchains\nexport ANDROID_TC=\$HOME/Android/Toolchains\n" >> $HOME/.profile
mkdir $HOME/3rdParty
wget -O /tmp/openssl.tgz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
tar xzf /tmp/openssl.tgz --directory=$HOME/3rdParty
printf "\n# OpenSSL sources\nexport OPENSSL_SRC=\$HOME/3rdParty/openssl-${OPENSSL_VERSION}\n" >> $HOME/.profile
wget -O /tmp/curl.tgz https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
tar xzf /tmp/curl.tgz --directory=$HOME/3rdParty
printf "\n# cURL sources\nexport CURL_SRC=\$HOME/3rdParty/curl-${CURL_VERSION}\n" >> $HOME/.profile
SHELL
end