From 004efd75fd1786d1602e5922154a6a805f8849b7 Mon Sep 17 00:00:00 2001 From: Erik Bershel Date: Mon, 6 Nov 2023 14:00:49 +0100 Subject: [PATCH] [Windows] Remove Android SDK Patch applier v4 --- images/linux/scripts/tests/Android.Tests.ps1 | 3 +-- images/win/toolsets/toolset-2019.json | 3 +-- images/win/toolsets/toolset-2022.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 4c0b29964330..0ed6847e5a6d 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -33,7 +33,6 @@ Describe "Android" { # 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' # 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' - # 'patcher;v4' -> 'patcher/v4' $PackageName = $PackageName.Replace(";", "/") $targetPath = Join-Path $env:ANDROID_HOME $PackageName $targetPath | Should -Exist @@ -65,4 +64,4 @@ Describe "Android" { Validate-AndroidPackage $PackageName } } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b15f5d5ac3f2..366cc92fcebe 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -170,8 +170,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "cmake;3.22.1", - "patcher;v4" + "cmake;3.22.1" ], "ndk": { "default": "25", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 812d5fedf5e5..fc09ab007343 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -144,8 +144,7 @@ "addon_list": [], "additional_tools": [ "cmake;3.18.1", - "cmake;3.22.1", - "patcher;v4" + "cmake;3.22.1" ], "ndk": { "default": "25",