Merge pull request #1696 from akv-platform/al-cheb/win-android-dyn

[Windows] Retrieve the list of Android packages for installing dynamically

images/win/scripts/ImageHelpers/ImageHelpers.psm1

@@ -37,6 +37,9 @@ Export-ModuleMember -Function @(
     'Get-VsCatalogJsonPath'
     'Get-VisualStudioPath'
     'Install-AndroidSDKPackages'
+    'Get-AndroidPackages'
+    'Get-AndroidPackagesByName'
+    'Get-AndroidPackagesByVersion'
     'Get-VisualStudioPackages'
     'Get-VisualStudioComponents'
 )

images/win/scripts/ImageHelpers/InstallHelpers.ps1

@@ -418,3 +418,41 @@ function Install-AndroidSDKPackages {
         & $AndroidSDKManagerPath --sdk_root=$AndroidSDKRootPath "$PrefixPackageName$package"
     }
 }
+
+function Get-AndroidPackages {
+    Param
+    (
+        [Parameter(Mandatory=$true)]
+        [string]$AndroidSDKManagerPath
+    )
+
+    return (& $AndroidSDKManagerPath --list --verbose).Trim() | Foreach-Object { $_.Split()[0] } | Where-Object {$_}
+}
+
+function Get-AndroidPackagesByName {
+    Param (
+        [Parameter(Mandatory=$true)]
+        [string[]]$AndroidPackages,
+        [Parameter(Mandatory=$true)]
+        [string]$PrefixPackageName
+    )
+
+    return $AndroidPackages | Where-Object { "$_".StartsWith($PrefixPackageName) }
+}
+
+function Get-AndroidPackagesByVersion {
+    Param (
+        [Parameter(Mandatory=$true)]
+        [string[]]$AndroidPackages,
+        [Parameter(Mandatory=$true)]
+        [string]$PrefixPackageName,
+        [object]$MinimumVersion,
+        [char]$Delimiter,
+        [int]$Index = 0
+    )
+
+    $Type = $MinimumVersion.GetType()
+    $packagesByName = Get-AndroidPackagesByName -AndroidPackages $AndroidPackages -PrefixPackageName $PrefixPackageName
+    $packagesByVersion = $packagesByName | Where-Object { ($_.Split($Delimiter)[$Index] -as $Type) -ge $MinimumVersion }
+    return $packagesByVersion | Sort-Object { $_.Split($Delimiter)[$Index] -as $Type} -Unique
+}

images/win/scripts/Installers/Update-AndroidSDK.ps1

@@ -3,14 +3,7 @@
 ##  Desc:  Install and update Android SDK and tools
 ################################################################################
 
-# Download the latest command line tools so that we can accept all of the licenses.
-# See https://developer.android.com/studio/#command-tools
-$sdkArchPath = Start-DownloadWithRetry -Url "https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip" -Name "android-sdk-tools.zip"
-
-# Don't replace the one that VS installs as it seems to break things.
-Expand-Archive -Path $sdkArchPath -DestinationPath android-sdk -Force
-
-$sdk = Get-Item -Path .\android-sdk
+$ErrorActionPreference = "Stop"
 
 # Install the standard Android SDK licenses. In the past, there wasn't a better way to do this,
 # so we are base64-encoding a zip of the licenses directory from another installation.
@@ -30,7 +23,6 @@ $content = [System.Convert]::FromBase64String($base64Content)
 Set-Content -Path .\android-sdk-licenses.zip -Value $content -Encoding Byte
 Expand-Archive -Path .\android-sdk-licenses.zip -DestinationPath 'C:\Program Files (x86)\Android\android-sdk' -Force
 
-
 # run the updates.
 # keep newer versions in descending order
 
@@ -42,15 +34,32 @@ $sdkManager = "$sdkRoot\tools\bin\sdkmanager.bat"
 
 & $sdkManager --sdk_root=$sdkRoot "platform-tools"
 
-Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
-                          -AndroidSDKRootPath $sdkRoot `
-                          -AndroidPackages $androidToolset.platform_list `
-                          -PrefixPackageName "platforms;"
+# get packages info
+$androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager
+
+# platforms
+[int]$platformMinVersion = $androidToolset.platform_min_version
+$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
+                -PrefixPackageName "platforms;" `
+                -MinimumVersion $platformMinVersion `
+                -Delimiter "-" `
+                -Index 1
+
+# build-tools
+[version]$buildToolsMinVersion = $androidToolset.build_tools_min_version
+$buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
+                  -PrefixPackageName "build-tools;" `
+                  -MinimumVersion $buildToolsMinVersion `
+                  -Delimiter ";" `
+                  -Index 1
 
 Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
                           -AndroidSDKRootPath $sdkRoot `
-                          -AndroidPackages $androidToolset.build_tools `
-                          -PrefixPackageName "build-tools;"
+                          -AndroidPackages $platformList
+
+Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
+                          -AndroidSDKRootPath $sdkRoot `
+                          -AndroidPackages $buildToolsList
 
 Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
                           -AndroidSDKRootPath $sdkRoot `

images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1

@@ -31,7 +31,6 @@ function Get-AndroidInstalledPackages {
     return $androidInstalledPackages
 }
 
-
 function Build-AndroidTable {
     $packageInfo = Get-AndroidInstalledPackages
     return @(

images/win/scripts/Tests/Android.Tests.ps1

@@ -2,16 +2,27 @@ Import-Module (Join-Path $PSScriptRoot "..\SoftwareReport\SoftwareReport.Android
 
 Describe "Android SDK" {
     $androidToolset = (Get-ToolsetContent).android
+    $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath (Get-AndroidSDKManagerPath)
     $androidInstalledPackages = Get-AndroidInstalledPackages
 
     $platformTestCases = @()
-    $platformList = $androidToolset.platform_list
+    [int]$platformMinVersion = $androidToolset.platform_min_version
+    $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
+                    -PrefixPackageName "platforms;" `
+                    -MinimumVersion $platformMinVersion `
+                    -Delimiter "-" `
+                    -Index 1
     $platformList | ForEach-Object {
         $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages }
     }
 
     $buildToolsTestCases = @()
-    $buildToolsList = $androidToolset.build_tools
+    [version]$buildToolsMinVersion = $androidToolset.build_tools_min_version
+    $buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
+                    -PrefixPackageName "build-tools;" `
+                    -MinimumVersion $buildToolsMinVersion `
+                    -Delimiter ";" `
+                    -Index 1
     $buildToolsList | ForEach-Object {
         $buildToolsTestCases += @{ buildToolsVersion = $_; installedPackages = $androidInstalledPackages }
     }
@@ -35,14 +46,14 @@ Describe "Android SDK" {
     }
 
     It "Platform version <platformVersion> is installed" -TestCases $platformTestCases {
-        "$installedPackages" | Should -Match "platforms;$platformVersion"
+        "$installedPackages" | Should -Match "$platformVersion"
     }
 
     It "Platform build tools <buildToolsVersion> is installed" -TestCases $buildToolsTestCases {
-        "$installedPackages" | Should -Match "build-tools;$buildToolsVersion"
+        "$installedPackages" | Should -Match "$buildToolsVersion"
     }
 
-    if (Test-isWin19) {
+    if (Test-IsWin19) {
         It "Extra package <extraPackage> is installed" -TestCases $extraPackagesTestCases {
             "$installedPackages" | Should -Match "extras;$extraPackage"
         }

images/win/toolsets/toolset-2016.json

@@ -127,12 +127,8 @@
         }
     ],
     "android": {
-        "platform_list": [
-            "android-30", "android-29", "android-28", "android-27", "android-26", "android-25", "android-24", "android-23", "android-22", "android-21", "android-19"
-        ],
-        "build_tools": [
-            "30.0.2", "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0", "26.0.3", "26.0.2", "26.0.1", "26.0.0", "25.0.3", "25.0.2", "25.0.1", "25.0.0", "24.0.3", "24.0.2", "24.0.1", "24.0.0", "23.0.3", "23.0.2", "23.0.1", "22.0.1", "21.1.2", "20.0.0", "19.1.0"
-        ],
+        "platform_min_version": "19",
+        "build_tools_min_version": "19.1.0",
         "extra_list": [
             "android;m2repository",
             "google;m2repository",

images/win/toolsets/toolset-2019.json

@@ -136,12 +136,8 @@
         }
     ],
     "android": {
-        "platform_list": [
-            "android-30", "android-29", "android-28", "android-27", "android-26", "android-25", "android-24", "android-23", "android-22", "android-21", "android-19"
-        ],
-        "build_tools": [
-            "30.0.2", "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0", "26.0.3", "26.0.2", "26.0.1", "26.0.0", "25.0.3", "25.0.2", "25.0.1", "25.0.0", "24.0.3", "24.0.2", "24.0.1", "24.0.0", "23.0.3", "23.0.2", "23.0.1", "22.0.1", "21.1.2", "20.0.0", "19.1.0"
-        ],
+        "platform_min_version": "19",
+        "build_tools_min_version": "19.1.0",
         "extra_list": [
             "android;m2repository",
             "google;m2repository",