From: Marcus <bubu@bubu1.eu>
Date: Wed, 27 Dec 2017 19:31:50 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 1.0.0~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=195a1bbae4197a94757200b84bd56dadebf4a1d2;hp=455dcc34d84625624bb00fc367e22779fd5f22c5;p=fdroidserver.git

Merge branch 'master' into 'master'

gradle file: use flavour specific versionCode/versionName, fall back to parsing line by line

See merge request fdroid/fdroidserver!426
---

diff --git a/makebuildserver b/makebuildserver
index 7e9ce9bd..cb46035e 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -178,8 +178,6 @@ cachefiles = [
      '9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8'),
     ('https://dl.google.com/android/repository/platform-26_r02.zip',
      '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
-    ('https://dl.google.com/android/repository/platform-27_r01.zip',
-     'cbba6f8fcf025e1b533326746763aa1d6e2cf4001b1b441602bb44d253bc49ac'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',