Unverified Commit 107c812f authored by Yegor's avatar Yegor Committed by GitHub

Update to SDK bundles with accepted licenses (#13941)

* Revert "Revert "Revert "Revert "Update Android sdkmanager for all platforms (#13912)" (#13922)" (#13923)" (#13935)"

This reverts commit f6fae1ce.

In this attempt we try to use SDK's with pre-accepted licenses.

* use SDK with pre-accepted licenses

* update readme
parent b741d91a
...@@ -97,7 +97,12 @@ tried, but it's not quite ready. ...@@ -97,7 +97,12 @@ tried, but it's not quite ready.
# Android Tools # Android Tools
Instructions to update the Android Tools version that the bots download by executing `download_android_tools.py`. The Android SDK and NDK used by Flutter's Chrome infra bots are stored in Google Cloud. During the build a bot runs the
`download_android_tools.py` script that downloads the required version of the Android SDK into `dev/bots/android_tools`.
To check which components are currently installed, download the current SDK stored in Google Cloud using the
`download_android_tools.py` script, then `dev/bots/android_tools/sdk/tools/bin/sdkmanager --list`. If you find that some
components need to be updated or installed, follow the steps below:
## How to update Android SDK on Google Cloud Storage ## How to update Android SDK on Google Cloud Storage
...@@ -105,18 +110,18 @@ Instructions to update the Android Tools version that the bots download by execu ...@@ -105,18 +110,18 @@ Instructions to update the Android Tools version that the bots download by execu
`$ dev/bots/android_tools/sdk/tools/android update sdk` `$ dev/bots/android_tools/sdk/tools/android update sdk`
Use `android.bat` on Windows. Use `android.bat` on Windows.
2. Choose/Update packages 2. Use the UI to choose the packages you want to install and/or update.
The following packages are currently installed:
* Android SDK Tools 3. Run `dev/bots/android_tools/sdk/tools/bin/sdkmanager --update`. On Windows, run `sdkmanager.bat` instead. If the
* Android SDK platform-tools process fails with an error saying that it is unable to move files (Windows makes files and directories read-only
* Android SDK Build-tools 24.0.3 when another process is holding them open), make a copy of the `dev/bots/android_tools/sdk/tools` directory, run
* Android 6.0 (API 23) the `sdkmanager.bat` from the copy, and use the `--sdk_root` option pointing at `dev/bots/android_tools/sdk`.
* SDK Platform 23
* Extras 4. Run `dev/bots/android_tools/sdk/tools/bin/sdkmanager --licenses` and accept the licenses for the newly installed
* Android Support Repository components. It also helps to run this command a second time and make sure that it prints "All SDK package licenses
* Google Play services accepted".
3. Run upload_android_tools.py -t sdk 5. Run upload_android_tools.py -t sdk
`$ dev/bots/upload_android_tools.py -t sdk` `$ dev/bots/upload_android_tools.py -t sdk`
## How to update Android NDK on Google Cloud Storage ## How to update Android NDK on Google Cloud Storage
......
5184094460409fe66dee956cc0ed6b7526cb0743 1db7fd4c472869bc1c879d7da32966f1c802e49e
cf7e7d4c13ff0c91b52578220b87e0475a51d783 a1500974e4d0ed0605f78860b06cf541575859e5
ca4fb2a0c639990e9cdf4a997ffa759fb76592e9 34304f0ab51bedb180cbf5795203c9d750b10849
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment