actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-20 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Switch android tools installation to use cmdline-tools' sdkmanager (#3686)

Browse Source 
* Switch android installation to use cmdline-tools
* Switch android-toolsets and xamarin-android-ndk to use new sdkmanager
* Remove cmdline-tools installation from toolset as it's installed
* Remove redundant steps with warning prevention
* Remove hardcoded licenses as they are accepted during the installation
* Add tests to check that both sdkmanagers are available
* Simplify Get-AndroidInstalledPackages function to use list_installed

* 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:
Mikhail Timofeev
2021-07-07 15:16:23 +03:00
committed by GitHub
parent 7d0d3aa82a
commit cc3405ff7a
7 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/provision/core/xamarin-android-ndk.sh
View File

@@ -3,7 +3,7 @@ source ~/utils/utils.sh
ANDROID_HOME=$HOME/Library/Android/sdk
ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
# Android NDK v16 is not compatible with old Xamarin.Android SDK
# and fails builds with BundleAssemblies enabled