diff --git a/buildserver/provision-android-sdk b/buildserver/provision-android-sdk index 54f89cb6..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" @@ -86,9 +90,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