From bb77d7a6d2e1d669162adb6fc5bbdd0d38220fbc Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 25 May 2021 17:30:20 +0200 Subject: [PATCH] buildserver: standardize SDK install location /opt/android-sdk _/opt/android-sdk_ was chosen for a number of reasons: * _/opt_ is [standardized][1] for packages like the Android SDK, which has its own directory layout. * _android-sdk_ is used rather than the upstream directory name from the ZIP (e.g. _android-sdk-linux_) so that the path is the same on all platforms. * On platforms without official _/opt_ support ([macOS][2], [Windows][3], [FreeBSD][4], etc.), it does not conflict with any existing system directory. [1]: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s13.html [2]: https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/FileSystemOverview/FileSystemOverview.html#//apple_ref/doc/uid/TP40010672-CH2-SW7 [3]: https://en.wikipedia.org/wiki/Directory_structure#Windows_10 [4]: https://www.freebsd.org/cgi/man.cgi?query=hier&sektion=7&format=html --- buildserver/Vagrantfile | 2 +- buildserver/config.buildserver.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile index 982c0267..63a891b1 100644 --- a/buildserver/Vagrantfile +++ b/buildserver/Vagrantfile @@ -79,7 +79,7 @@ Vagrant.configure("2") do |config| end config.vm.provision "shell", path: "setup-env-vars", - args: ["/home/vagrant/android-sdk"] + args: ["/opt/android-sdk"] config.vm.provision "shell", path: "provision-apt-get-install", args: [configfile['debian_mirror']] config.vm.provision "shell", path: "provision-android-sdk" diff --git a/buildserver/config.buildserver.yml b/buildserver/config.buildserver.yml index 2a3cb3fa..37b2bb4e 100644 --- a/buildserver/config.buildserver.yml +++ b/buildserver/config.buildserver.yml @@ -1,4 +1,4 @@ -sdk_path: /home/vagrant/android-sdk +sdk_path: /opt/android-sdk ndk_paths: r10e: /home/vagrant/android-ndk/r10e r21e: /home/vagrant/android-ndk/r21e