From 8a5a24c6ddd7c61c41452dd9e145f1a8fdbcb00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 21 Jan 2019 09:23:01 +0100 Subject: 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. --- misc/travis/android-tools-linux.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/travis/android-tools-linux.sh b/misc/travis/android-tools-linux.sh index 830820b10b..fb6e2f0f9b 100755 --- a/misc/travis/android-tools-linux.sh +++ b/misc/travis/android-tools-linux.sh @@ -71,11 +71,11 @@ if [ ! -d $ANDROID_NDK_DIR ]; then fi 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 -$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 EXPORT_VAL="export ANDROID_HOME=$ANDROID_SDK_PATH" -- cgit v1.2.3