From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 15 Sep 2016 09:29:31 +0000 (+0200)
Subject: buildserver: ignore android sdk repos of proprietary bits
X-Git-Tag: 0.8~159^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5af53238d398c41e09f9f0c6e3923025a5702028;p=fdroidserver.git

buildserver: ignore android sdk repos of proprietary bits

The Android SDK by default includes some Google repositories of their
proprietary SDKs.  We of course do not want that stuff ever.  We also do
not need the emulator images since this process does not currently install
or run an emulator.
---

diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk
index 57eacdc4..946f1e70 100644
--- a/buildserver/provision-android-sdk
+++ b/buildserver/provision-android-sdk
@@ -23,6 +23,22 @@ if [ ! -x $ANDROID_HOME/tools/android ]; then
     unzip -qq $tools
 fi
 
+# disable the repositories of proprietary stuff
+disabled="
+@version@=1
+@disabled@https\://dl.google.com/android/repository/extras/intel/addon.xml=disabled
+@disabled@https\://dl.google.com/android/repository/glass/addon.xml=disabled
+@disabled@https\://dl.google.com/android/repository/sys-img/android/sys-img.xml=disabled
+@disabled@https\://dl.google.com/android/repository/sys-img/android-tv/sys-img.xml=disabled
+@disabled@https\://dl.google.com/android/repository/sys-img/android-wear/sys-img.xml=disabled
+@disabled@https\://dl.google.com/android/repository/sys-img/google_apis/sys-img.xml=disabled
+"
+test -d ${HOME}/.android || mkdir ${HOME}/.android
+for line in $disabled; do
+    echo $line >> ${HOME}/.android/sites-settings.cfg
+done
+
+
 cd /vagrant/cache
 
 # make links for `android update sdk` to use and delete