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

Merge pull request #1810 from akv-platform/al-cheb/ubuntu-del-obsolete-android-pkgs

Browse Source 
[Ubuntu] Do not install obsolete Android build-tools packages
This commit is contained in:
Maxim Lobanov
2020-10-14 19:24:00 +03:00
committed by GitHub
parent 229cf5e69f ad8f519477
commit 5d7f1b487e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ additional=$(jq -r '.android.additional_tools[]' $toolset)
components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" )
availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1))
allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/})
filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}"

2
images/linux/toolsets/toolset-1604.json
View File

@@ -64,7 +64,7 @@
],
"android": {
"platform_min_version": "10",
"build_tools_min_version": "17.0.0",
"build_tools_min_version": "19.1.0",
"extra_list": [
"android;m2repository",
"google;m2repository",

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

@@ -64,7 +64,7 @@
],
"android": {
"platform_min_version": "17",
"build_tools_min_version": "17.0.0",
"build_tools_min_version": "19.1.0",
"extra_list": [
"android;m2repository",
"google;m2repository",