From bd96c65c8899148a0ff5e5914a1c9eae12167bb0 Mon Sep 17 00:00:00 2001
From: Alexey Ayupov <“alexey.ayupov@akvelon.com”>
Date: Wed, 3 Jan 2024 11:24:48 +0100
Subject: [PATCH] [Windows] Remove old android SDK versions

---
 images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 | 4 ----
 images/windows/scripts/tests/Android.Tests.ps1              | 4 ----
 images/windows/toolsets/toolset-2019.json                   | 4 ++--
 images/windows/toolsets/toolset-2022.json                   | 4 ++--
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1
index ad46586efdc9..9aeeb4df62a4 100644
--- a/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1
+++ b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1
@@ -38,10 +38,6 @@ function Build-AndroidTable {
             "Package" = "Android SDK Platform-Tools"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools"
         },
-        @{
-            "Package" = "Android SDK Tools"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools"
-        },
         @{
             "Package" = "Android Support Repository"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository"
diff --git a/images/windows/scripts/tests/Android.Tests.ps1 b/images/windows/scripts/tests/Android.Tests.ps1
index 3ed9da8b75e8..2716b87f494a 100644
--- a/images/windows/scripts/tests/Android.Tests.ps1
+++ b/images/windows/scripts/tests/Android.Tests.ps1
@@ -30,10 +30,6 @@ Describe "Android SDK" {
 
     Context "SDKManagers" {
         $testCases = @(
-            @{
-                PackageName = "SDK tools"
-                Sdkmanager = "$env:ANDROID_HOME\tools\bin\sdkmanager.bat"
-            },
             @{
                 PackageName = "Command-line tools"
                 Sdkmanager = "$env:ANDROID_HOME\cmdline-tools\latest\bin\sdkmanager.bat"
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
index 6669619061a0..00fb1a37d8aa 100644
--- a/images/windows/toolsets/toolset-2019.json
+++ b/images/windows/toolsets/toolset-2019.json
@@ -149,8 +149,8 @@
     "android": {
         "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip",
         "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D",
-        "platform_min_version": "19",
-        "build_tools_min_version": "19.1.0",
+        "platform_min_version": "31",
+        "build_tools_min_version": "31.0.0",
         "extras": [
             "android;m2repository",
             "google;m2repository",
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 200bc3c6f1e0..be15c713c76f 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -133,8 +133,8 @@
     "android": {
         "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip",
         "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D",
-        "platform_min_version": "27",
-        "build_tools_min_version": "27.0.0",
+        "platform_min_version": "31",
+        "build_tools_min_version": "31.0.0",
         "extras": [
             "android;m2repository",
             "google;m2repository",