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

Freeze NDK 21 on Ubuntu Images (#2500)

Browse Source
This commit is contained in:
Dmitry Shibanov
2021-01-21 11:32:27 +03:00
committed by GitHub
parent 905516cc9c
commit 51afead06e
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,11 @@ additional=$(get_toolset_value '.android.additional_tools[]')
# Install the following SDKs and build tools, passing in "y" to accept licenses. # Install the following SDKs and build tools, passing in "y" to accept licenses.
components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" ) components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" )
# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061).
# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481
# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526
ln -s $ANDROID_SDK_ROOT/ndk/21.3.6528147 $ANDROID_NDK_ROOT
availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1)) 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 | 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]/}) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/})

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

@@ -106,7 +106,7 @@
"cmake;3.6.4111459", "cmake;3.6.4111459",
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"ndk-bundle", "ndk;21.3.6528147",
"platform-tools", "platform-tools",
"cmdline-tools;latest" "cmdline-tools;latest"
] ]

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

@@ -102,7 +102,7 @@
"cmake;3.6.4111459", "cmake;3.6.4111459",
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"ndk-bundle", "ndk;21.3.6528147",
"platform-tools", "platform-tools",
"cmdline-tools;latest" "cmdline-tools;latest"
] ]

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

@@ -85,7 +85,7 @@
"additional_tools": [ "additional_tools": [
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"ndk-bundle", "ndk;21.3.6528147",
"platform-tools", "platform-tools",
"cmdline-tools;latest" "cmdline-tools;latest"
] ]