mirror of
https://github.com/actions/runner-images.git
synced 2025-12-20 06:35:47 +00:00
[Ubuntu] Switch android tools installation to use sdkmanager from command-line tools (#3650)
* Switch android tools installation to cmdline-tools * Replace deprecated sdkmanger from sdk-tools to the one from cmdline tools * Remove patcherv4 from toolsets as it's included in m2repository extras * Add tests to make sure both sdkmanagers exist * Return cmdline-tools to software readme * Get-AndroidInstalledPackages function now use list_installed param * Create a function to get sdkmanager version = cmdline tools version * Get rid of hardcoded path to ANDROID_HOME * Add reloadEtcEnvironment call to installation script * Use env variable ANDROID_HOME in tests * Modify software report to output any version * Change regex pattern to output the group * Currently the function returns 4. instead of 4.0, this change fixes it
This commit is contained in:
@@ -96,9 +96,7 @@
|
||||
"additional_tools": [
|
||||
"cmake;3.10.2.4988404",
|
||||
"cmake;3.18.1",
|
||||
"patcher;v4",
|
||||
"platform-tools",
|
||||
"cmdline-tools;latest"
|
||||
"platform-tools"
|
||||
],
|
||||
"ndk": {
|
||||
"lts": "21"
|
||||
|
||||
@@ -92,9 +92,7 @@
|
||||
"additional_tools": [
|
||||
"cmake;3.10.2.4988404",
|
||||
"cmake;3.18.1",
|
||||
"patcher;v4",
|
||||
"platform-tools",
|
||||
"cmdline-tools;latest"
|
||||
"platform-tools"
|
||||
],
|
||||
"ndk": {
|
||||
"lts": "21"
|
||||
|
||||
@@ -88,9 +88,7 @@
|
||||
"additional_tools": [
|
||||
"cmake;3.10.2.4988404",
|
||||
"cmake;3.18.1",
|
||||
"patcher;v4",
|
||||
"platform-tools",
|
||||
"cmdline-tools;latest"
|
||||
"platform-tools"
|
||||
],
|
||||
"ndk": {
|
||||
"lts": "21",
|
||||
|
||||
Reference in New Issue
Block a user