Skip to content

Commit 2e38aa8

Browse files
author
Vladimir K Urushev
committed
Migrate to Ubuntu, minor fixes for android build script
1 parent fc706fb commit 2e38aa8

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

android/Vagrantfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
VAGRANTFILE_API_VERSION = "2"
55

66
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
7-
config.vm.box = "hashicorp/precise64"
7+
config.vm.box = "ubuntu/xenial64"
88
config.ssh.forward_agent = TRUE
99

1010
config.vm.provider "virtualbox" do |vb|
1111
vb.memory = 4096
1212
vb.cpus = 2
1313
end
1414

15-
config.vm.network "private_network", ip: "192.168.50.4"
15+
config.vm.network "private_network", ip: "192.168.56.4"
1616
config.vm.synced_folder ".", "/vagrant", type: :nfs
1717

1818
config.vm.provision "shell", path: "provision.sh"

android/build.sh

100644100755
+3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ install_dependencies() {
4545
sudo apt-get -y install wget git gnupg flex bison gperf build-essential zip curl subversion pkg-config libglib2.0-dev libgtk2.0-dev libxtst-dev libxss-dev libpci-dev libdbus-1-dev libgconf2-dev libgnome-keyring-dev libnss3-dev
4646
#Download the latest script to install the android dependencies for ubuntu
4747
curl https://chromium.googlesource.com/chromium/src/+/master/build/install-build-deps-android.sh?format=TEXT | base64 -d > install-build-deps-android.sh
48+
curl https://chromium.googlesource.com/chromium/src/+/master/build/install-build-deps.sh?format=TEXT | base64 -d > install-build-deps.sh
4849
#use bash (not dash which is default) to run the script
50+
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
51+
sudo chmod +x install-build-deps.sh
4952
sudo /bin/bash ./install-build-deps-android.sh
5053
#delete the file we just downloaded... not needed anymore
5154
#rm install-build-deps-android.sh

android/provision.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source /vagrant/build.sh
55

66
install_dependencies
77

8-
echo "source /vagrant/build.sh" >> /home/vagrant/.bashrc
8+
echo "source /vagrant/build.sh" >> /home/ubuntu/.bashrc

0 commit comments

Comments
 (0)