[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fdroid: use Android SDK from Debian/stretch packages

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit 12150ef0d51c7e99151eeda92d748c7e3c51bf6f
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Feb 15 14:21:43 2017 +0100

    reproducible fdroid: use Android SDK from Debian/stretch packages
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible_setup_fdroid_build_environment.sh | 3 +++
 update_jdn.sh                                      | 1 +
 2 files changed, 4 insertions(+)

diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index b022e23..0a2f8a3 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 463a65a..813cd7e 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git