瀏覽代碼

Travis: Fix accepting Android SDK licenses

It has been failing since a few days, apparently `sdkmanager --licenses`
is no longer sufficient to accept all licenses, the `platform-tools` install
triggers another license dialog. Now saying yes to all just in case.
Rémi Verschelde 6 年之前
父節點
當前提交
8a5a24c6dd
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      misc/travis/android-tools-linux.sh

+ 4 - 4
misc/travis/android-tools-linux.sh

@@ -71,11 +71,11 @@ if [ ! -d $ANDROID_NDK_DIR ]; then
 fi
 fi
 
 
 echo "Installing: Android Tools ..."
 echo "Installing: Android Tools ..."
-#$ANDROID_SDK_DIR/tools/bin/sdkmanager --all
+mkdir -p ~/.android && echo "count=0" > ~/.android/repositories.cfg
 yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager --licenses > /dev/null
 yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager --licenses > /dev/null
-$ANDROID_SDK_DIR/tools/bin/sdkmanager 'tools' > /dev/null
-$ANDROID_SDK_DIR/tools/bin/sdkmanager 'platform-tools' > /dev/null
-$ANDROID_SDK_DIR/tools/bin/sdkmanager 'build-tools;28.0.1' > /dev/null
+yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager 'tools' > /dev/null
+yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager 'platform-tools' > /dev/null
+yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager 'build-tools;28.0.1' > /dev/null
 echo
 echo
 
 
 EXPORT_VAL="export ANDROID_HOME=$ANDROID_SDK_PATH"
 EXPORT_VAL="export ANDROID_HOME=$ANDROID_SDK_PATH"