Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[macos] introduce toolset possibility to install Android SDK Tools
  • Loading branch information
ilia-shipitsin committed Oct 17, 2023
commit ac9877f17915bbefcc70d9044c2e526540440cc4
9 changes: 9 additions & 0 deletions images/macos/provision/core/android-toolsets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,13 @@ do
echo y | $SDKMANAGER "$tool_name"
done

# Download SDK tools to preserve backward compatibility
sdkTools="android-sdk-tools.zip"
sdkToolsVersion=$(get_toolset_value '.android."sdk-tools"')
if [ "$sdkToolsVersion" != "null" ]; then
download_with_retries "https://dl.google.com/android/repository/${sdkToolsVersion}" "." $sdkTools
unzip -qq $sdkTools -d ${ANDROID_SDK_ROOT}
rm -f $sdkTools
fi

invoke_tests "Android"