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

[Windows] Remove Android SDK Patch applier v4 (#8750)

Browse Source
This commit is contained in:
Erik Bershel
2023-11-06 18:05:31 +01:00
committed by GitHub
parent 7b64e0503e
commit 2caa346dc5
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/linux/scripts/tests/Android.Tests.ps1
View File

@@ -33,7 +33,6 @@ Describe "Android" {
# Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' ->
# 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1' # 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1'
# 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' # 'cmake;3.6.4111459' -> 'cmake/3.6.4111459'
# 'patcher;v4' -> 'patcher/v4'
$PackageName = $PackageName.Replace(";", "/") $PackageName = $PackageName.Replace(";", "/")
$targetPath = Join-Path $env:ANDROID_HOME $PackageName $targetPath = Join-Path $env:ANDROID_HOME $PackageName
$targetPath | Should -Exist $targetPath | Should -Exist
@@ -65,4 +64,4 @@ Describe "Android" {
Validate-AndroidPackage $PackageName Validate-AndroidPackage $PackageName
} }
} }
} }

3
images/win/toolsets/toolset-2019.json
View File

@@ -170,8 +170,7 @@
"additional_tools": [ "additional_tools": [
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"cmake;3.18.1", "cmake;3.18.1",
"cmake;3.22.1", "cmake;3.22.1"
"patcher;v4"
], ],
"ndk": { "ndk": {
"default": "25", "default": "25",

3
images/win/toolsets/toolset-2022.json
View File

@@ -144,8 +144,7 @@
"addon_list": [], "addon_list": [],
"additional_tools": [ "additional_tools": [
"cmake;3.18.1", "cmake;3.18.1",
"cmake;3.22.1", "cmake;3.22.1"
"patcher;v4"
], ],
"ndk": { "ndk": {
"default": "25", "default": "25",