actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-15 14:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] Remove old android SDK versions (#9094)

Browse Source
This commit is contained in:
Alexey-Ayupov
2024-01-03 21:21:02 +01:00
committed by GitHub
parent 20d2e9821f
commit a9b737bac5
5 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/ubuntu/scripts/build/install-android-sdk.sh
View File

@@ -113,9 +113,6 @@ add_filtered_instalaltion_components $minimum_build_tool_version "${available_bu
# Install components # Install components
echo "y" | $SDKMANAGER ${components[@]} echo "y" | $SDKMANAGER ${components[@]}
# Old skdmanager from sdk tools doesn't work with Java > 8, set version 8 explicitly
sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager
# Add required permissions # Add required permissions
chmod -R a+rwx ${ANDROID_SDK_ROOT} chmod -R a+rwx ${ANDROID_SDK_ROOT}

4
images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1
View File

@@ -43,10 +43,6 @@ function Build-AndroidTable {
"Package" = "Android SDK Platforms" "Package" = "Android SDK Platforms"
"Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo
}, },
@{
"Package" = "Android SDK Tools"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools"
},
@{ @{
"Package" = "Android Support Repository" "Package" = "Android Support Repository"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository"

4
images/ubuntu/scripts/tests/Android.Tests.ps1
View File

@@ -81,10 +81,6 @@ Describe "Android" {
Context "SDKManagers" { Context "SDKManagers" {
$testCases = @( $testCases = @(
@{
PackageName = "SDK tools"
Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager"
},
@{ @{
PackageName = "Command-line tools" PackageName = "Command-line tools"
Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"

4
images/ubuntu/toolsets/toolset-2004.json
View File

@@ -79,8 +79,8 @@
}, },
"android": { "android": {
"cmdline-tools": "commandlinetools-linux-9477386_latest.zip", "cmdline-tools": "commandlinetools-linux-9477386_latest.zip",
"platform_min_version": "27", "platform_min_version": "31",
"build_tools_min_version": "27.0.0", "build_tools_min_version": "31.0.0",
"extra_list": [ "extra_list": [
"android;m2repository", "android;m2repository",
"google;m2repository", "google;m2repository",

4
images/ubuntu/toolsets/toolset-2204.json
View File

@@ -73,8 +73,8 @@
}, },
"android": { "android": {
"cmdline-tools": "commandlinetools-linux-9477386_latest.zip", "cmdline-tools": "commandlinetools-linux-9477386_latest.zip",
"platform_min_version": "27", "platform_min_version": "31",
"build_tools_min_version": "27.0.0", "build_tools_min_version": "31.0.0",
"extra_list": [ "extra_list": [
"android;m2repository", "android;m2repository",
"google;m2repository", "google;m2repository",