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

[Ubuntu] Hardcode android cmd-tools on 18.04 (#7005)

Browse Source
This commit is contained in:
Mikhail Koliada
2023-01-29 19:54:27 +01:00
committed by GitHub
parent 1e75a20a49
commit fab3a48efe
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/linux/scripts/installers/android.sh
View File

@@ -43,6 +43,12 @@ echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment
# Create android sdk directory # Create android sdk directory
mkdir -p ${ANDROID_SDK_ROOT} mkdir -p ${ANDROID_SDK_ROOT}
cmdlineTools="android-cmdline-tools.zip"
if isUbuntu18; then
# Newer command-line-tools require Java 11 which is not default on ubuntu-18.04
download_with_retries "https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" "." $cmdlineTools
else
# Download the latest command line tools so that we can accept all of the licenses. # Download the latest command line tools so that we can accept all of the licenses.
# See https://developer.android.com/studio/#command-tools # See https://developer.android.com/studio/#command-tools
cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"')
@@ -61,8 +67,9 @@ if [[ $cmdlineToolsVersion == "latest" ]]; then
fi fi
fi fi
cmdlineTools="android-cmdline-tools.zip"
download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" "." $cmdlineTools download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" "." $cmdlineTools
fi
unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools
# Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root # Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root
mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest

1
images/linux/toolsets/toolset-1804.json
View File

@@ -87,7 +87,6 @@
"maven": "3.8.7" "maven": "3.8.7"
}, },
"android": { "android": {
"cmdline-tools": "latest",
"platform_min_version": "23", "platform_min_version": "23",
"build_tools_min_version": "23.0.1", "build_tools_min_version": "23.0.1",
"extra_list": [ "extra_list": [