diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2017-02-15 14:21:43 +0100 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@debian.org> | 2017-02-15 14:54:04 +0100 |
| commit | 12150ef0d51c7e99151eeda92d748c7e3c51bf6f (patch) | |
| tree | 649a847175ab278ec7b0115f84c37a68630a70da | |
| parent | 55af235ed4815d73139935611e1a973f7abc11f3 (diff) | |
| download | jenkins.debian.net-12150ef0d51c7e99151eeda92d748c7e3c51bf6f.tar.xz | |
reproducible fdroid: use Android SDK from Debian/stretch packages
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
| -rwxr-xr-x | bin/reproducible_setup_fdroid_build_environment.sh | 3 | ||||
| -rwxr-xr-x | update_jdn.sh | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh index b022e23c..0a2f8a38 100755 --- a/bin/reproducible_setup_fdroid_build_environment.sh +++ b/bin/reproducible_setup_fdroid_build_environment.sh @@ -49,6 +49,9 @@ git clone https://gitlab.com/eighthave/fdroidserver.git cd fdroidserver git checkout jenkins # normally master too +# set up Android SDK to use the Debian packages in stretch +export ANDROID_HOME=/usr/lib/android-sdk + # this script is maintained upstream and is also run on Guardian # Project's jenkins box ./jenkins-build-makebuildserver diff --git a/update_jdn.sh b/update_jdn.sh index 463a65a0..813cd7e2 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -345,6 +345,7 @@ if [ -f /etc/debian_version ] ; then # needed to run fdroid jobs case $HOSTNAME in profitbricks-build7-amd64) DEBS="$DEBS + android-sdk libvirt-clients libvirt-daemon libvirt-daemon-system |