diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-21 09:23:01 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-21 09:40:30 +0100 |
| commit | 8a5a24c6ddd7c61c41452dd9e145f1a8fdbcb00d (patch) | |
| tree | be91c5998c4689311c5f05213aed548701f34f6e /misc | |
| parent | f0035b7cc78392938c5c163e961ff4604cb10c1a (diff) | |
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.
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/travis/android-tools-linux.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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" |