migrate teamcity_init.sh script to use sdkmanager

StepicOrg · Mar 20, 2018 · a046b99 · a046b99
1 parent 1b6bb29
commit a046b99
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/buildsystem/teamcity_init.sh b/buildsystem/teamcity_init.sh
@@ -7,12 +7,10 @@ TOOLS_DIR=$ANDROID_HOME/build-tools/$TOOLS_VERSION
 
 if [ ! -d "$SDK_DIR" ]; then
     echo "Installing Android SDK version $SDK_VERSION"
-    echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --filter \
-    android-$SDK_VERSION
+    yes | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-$SDK_VERSION" --verbose
 fi
 
 if [ ! -d "$TOOLS_DIR" ]; then
     echo "Installing Android build-tools version $TOOLS_VERSION"
-    echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --filter \
-    build-tools-$TOOLS_VERSION
+    yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$TOOLS_VERSION" --verbose
 fi