From: Hans-Christoph Steiner Date: Mon, 13 Mar 2017 15:31:27 +0000 (+0100) Subject: buildserver: support new ConstraintLayout license bullshit X-Git-Tag: 0.8~107^2~1 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=590160d76693d62ccb1aaf24b816a02cf9bd4c31;p=fdroidserver.git buildserver: support new ConstraintLayout license bullshit The new ConstraintLayout library in Android Support has some new custom way of handling the license. I suspect that they are going to use this new way with all of the bits that gradle downloads. We also have to support it for apps that use it, including soon fdroidclient. fdroiddata!2094 ci-images!1 --- diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk index 7c9b3286..00456fbe 100644 --- a/buildserver/provision-android-sdk +++ b/buildserver/provision-android-sdk @@ -71,6 +71,13 @@ y EOH +mkdir -p $ANDROID_HOME/licenses/ +echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license +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" +echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" +echo y | $ANDROID_HOME/tools/bin/sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" chmod -R a+rX $ANDROID_HOME/ find $ANDROID_HOME/ -type f -executable -print0 | xargs -0 chmod a+x