diff options
| author | bors <bors@rust-lang.org> | 2019-01-23 15:53:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-23 15:53:23 +0000 |
| commit | 19f8958f827e379be9b0ffc93fca580ec8ffac77 (patch) | |
| tree | af2480225b4dc6068847ea23277ffd9fe877ac47 | |
| parent | 6bba352cad2117f56353d400f71e96eafa2e6bd7 (diff) | |
| parent | 91f328fb557cb4e4623bf50188168c2c1d9cc390 (diff) | |
| download | rust-19f8958f827e379be9b0ffc93fca580ec8ffac77.tar.gz rust-19f8958f827e379be9b0ffc93fca580ec8ffac77.zip | |
Auto merge of #57857 - pietroalbini:fix-android-ci, r=aidanhs
Fix Android CI failing to download SDKs A component of the Android SDK now requires an additional license ([full license text](https://gist.github.com/pietroalbini/28b46a6fed0921d129de58e7aef29f11)) to be accepted before it's possible to use it. The license is dated January 16th 2019, so it's recent. The weird thing about the license is that it doesn't prompt you to accept it during `sdkmanager --licenses` like all the other ones, but during `sdkmanager platform-tools emulator ...`, and we didn't pipe `yes` to it before this PR. The PR changes the SDK installation script to accept all the licenses even on the `sdkmanager platform-tools emulator` command.
| -rw-r--r-- | src/ci/docker/scripts/android-sdk.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/android-sdk.sh b/src/ci/docker/scripts/android-sdk.sh index e06c57fbab9..179f63fc830 100644 --- a/src/ci/docker/scripts/android-sdk.sh +++ b/src/ci/docker/scripts/android-sdk.sh @@ -20,7 +20,7 @@ download_sysimage() { # The output from sdkmanager is so noisy that it will occupy all of the 4 MB # log extremely quickly. Thus we must silence all output. yes | sdkmanager --licenses > /dev/null - sdkmanager platform-tools emulator \ + yes | sdkmanager platform-tools emulator \ "platforms;android-$api" \ "system-images;android-$api;default;$abi" > /dev/null } |