From 18effcdd2691ffa8f37f6cb15b8657d457a0d5ec Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:18:13 +0300
Subject: [PATCH] [Ubuntu] Fix Android tests to work with platform version S
 and remove Cmake 3.6 (#2755)

* fix tests

* get rid of build-tools letter list

* Remove Cmake 3.6, fix platforms test
---
 images/linux/scripts/tests/Android.Tests.ps1 | 15 ++++++++-------
 images/linux/toolsets/toolset-1604.json      |  1 -
 images/linux/toolsets/toolset-1804.json      |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1
index 3097e2b9f..0069c9e1c 100644
--- a/images/linux/scripts/tests/Android.Tests.ps1
+++ b/images/linux/scripts/tests/Android.Tests.ps1
@@ -5,13 +5,14 @@ Describe "Android" {
     [string]$ndkLTSVersion = Get-ToolsetValue "android.ndk.lts"
     $ndkLTSFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLTSVersion.*" | Select-Object -Last 1).Name
 
-    $platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' |
-    Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique |
-    ForEach-Object { "platforms/${_}" })
+    $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', ''
+    $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique
+    $platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique
+    $platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" }
 
-    $buildTools = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' |
-    Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique |
-    ForEach-Object { "build-tools/${_}" })
+    $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', ''
+    $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique |
+    ForEach-Object { "build-tools/${_}" }
 
     $androidPackages = @(
         $platforms,
@@ -23,7 +24,7 @@ Describe "Android" {
     )
 
     [string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest"
-    if ($ndkLatestVersion) {        
+    if ($ndkLatestVersion) {
         $ndkLatestFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name
         $androidPackages += @("ndk/$ndkLatestFullVersion")
     }
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index 39e3949a6..6985369b7 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -103,7 +103,6 @@
             "addon-google_apis-google-21"
         ],
         "additional_tools": [
-            "cmake;3.6.4111459",
             "cmake;3.10.2.4988404",
             "patcher;v4",
             "platform-tools",
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index bc8cbe30f..13158650a 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -99,7 +99,6 @@
             "addon-google_apis-google-21"
         ],
         "additional_tools": [
-            "cmake;3.6.4111459",
             "cmake;3.10.2.4988404",
             "patcher;v4",
             "platform-tools",