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 f6fae1ce3604fc4d73eecf03d39f1939e14229cc.
In this attempt we try to use SDK's with pre-accepted licenses.
* use SDK with pre-accepted licenses
* update readme
diff --git a/dev/bots/README.md b/dev/bots/README.md
index f4fea8e..db7137a 100644
--- a/dev/bots/README.md
+++ b/dev/bots/README.md
@@ -97,7 +97,12 @@
# 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
@@ -105,18 +110,18 @@
`$ dev/bots/android_tools/sdk/tools/android update sdk`
Use `android.bat` on Windows.
-2. Choose/Update packages
- The following packages are currently installed:
- * Android SDK Tools
- * Android SDK platform-tools
- * Android SDK Build-tools 24.0.3
- * Android 6.0 (API 23)
- * SDK Platform 23
- * Extras
- * Android Support Repository
- * Google Play services
+2. Use the UI to choose the packages you want to install and/or update.
-3. Run upload_android_tools.py -t sdk
+3. Run `dev/bots/android_tools/sdk/tools/bin/sdkmanager --update`. On Windows, run `sdkmanager.bat` instead. If the
+ process fails with an error saying that it is unable to move files (Windows makes files and directories read-only
+ when another process is holding them open), make a copy of the `dev/bots/android_tools/sdk/tools` directory, run
+ the `sdkmanager.bat` from the copy, and use the `--sdk_root` option pointing at `dev/bots/android_tools/sdk`.
+
+4. Run `dev/bots/android_tools/sdk/tools/bin/sdkmanager --licenses` and accept the licenses for the newly installed
+ components. It also helps to run this command a second time and make sure that it prints "All SDK package licenses
+ accepted".
+
+5. Run upload_android_tools.py -t sdk
`$ dev/bots/upload_android_tools.py -t sdk`
## How to update Android NDK on Google Cloud Storage
diff --git a/dev/bots/VERSION_LINUX_SDK b/dev/bots/VERSION_LINUX_SDK
index 681a883..eb15cf7 100644
--- a/dev/bots/VERSION_LINUX_SDK
+++ b/dev/bots/VERSION_LINUX_SDK
@@ -1 +1 @@
-5184094460409fe66dee956cc0ed6b7526cb0743
+1db7fd4c472869bc1c879d7da32966f1c802e49e
diff --git a/dev/bots/VERSION_MACOSX_SDK b/dev/bots/VERSION_MACOSX_SDK
index f2d06bc..227cbcf 100644
--- a/dev/bots/VERSION_MACOSX_SDK
+++ b/dev/bots/VERSION_MACOSX_SDK
@@ -1 +1 @@
-cf7e7d4c13ff0c91b52578220b87e0475a51d783
+a1500974e4d0ed0605f78860b06cf541575859e5
diff --git a/dev/bots/VERSION_WIN_SDK b/dev/bots/VERSION_WIN_SDK
index 91ca4dea..85d8ec3 100644
--- a/dev/bots/VERSION_WIN_SDK
+++ b/dev/bots/VERSION_WIN_SDK
@@ -1 +1 @@
-ca4fb2a0c639990e9cdf4a997ffa759fb76592e9
+34304f0ab51bedb180cbf5795203c9d750b10849
