From 358fedc611c5ea6fddbb70a752834840e37d14e7 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Tue, 14 Nov 2017 12:29:21 +0300
Subject: [PATCH 1/2] buildserver: allow gradle/sdkmanager to install new
 platforms

Google releases new API SDKs quite rarely (about 2 times a year), but when
they do this, many apps quickly start using it. Allow downloading new API
SDKs to avoid waiting for the next buildserver rebuild.
---
 buildserver/provision-android-sdk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk
index 54f89cb6..8e80519f 100644
--- a/buildserver/provision-android-sdk
+++ b/buildserver/provision-android-sdk
@@ -86,9 +86,9 @@ chgrp vagrant $ANDROID_HOME
 chmod g+w $ANDROID_HOME
 find $ANDROID_HOME/ -type f -executable -print0 | xargs -0 chmod a+x
 
-# allow gradle to install newer build-tools versions
-chgrp vagrant $ANDROID_HOME/build-tools
-chmod g+w $ANDROID_HOME/build-tools
+# allow gradle to install newer build-tools and platforms
+chgrp vagrant $ANDROID_HOME/{build-tools,platforms}
+chmod g+w $ANDROID_HOME/{build-tools,platforms}
 
 # allow gradle/sdkmanager to install into the new m2repository
 test -d $ANDROID_HOME/extras/m2repository || mkdir -p $ANDROID_HOME/extras/m2repository

From 3a7a043c683f297c72490be6efd06f9443a3bffc Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Tue, 14 Nov 2017 12:38:48 +0300
Subject: [PATCH 2/2] buildserver: add new android-sdk-license hash

The old hash does not work anymore, at least for platform-27. Where this
new one comes from:

1. Download command line tools from
   https://developer.android.com/studio/index.html#command-tools
2. Unzip the package
3. Run ./tools/bin/sdkmanager --licenses
4. Read and accept licenses
5. Find the hash in ./licenses/android-sdk-license
---
 buildserver/provision-android-sdk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk
index 8e80519f..b79c2e4a 100644
--- a/buildserver/provision-android-sdk
+++ b/buildserver/provision-android-sdk
@@ -74,7 +74,11 @@ y
 EOH
 
 mkdir -p $ANDROID_HOME/licenses/
-echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
+cat << EOF > $ANDROID_HOME/licenses/android-sdk-license
+
+8933bad161af4178b1185d1a37fbf41ea5269c55
+d56f5187479451eabf01fb78af6dfcb131a6481e
+EOF
 echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > $ANDROID_HOME/licenses/android-sdk-preview-license
 echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1"
 echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1"