[macos] Add Android Comand Line tools (#2363)

images/macos/provision/core/android-toolsets.sh

@@ -24,6 +24,7 @@ ANDROID_PLATFORM=($(get_toolset_value '.android.platform_min_version'))
 ANDROID_BUILD_TOOL=($(get_toolset_value '.android.build_tools_min_version'))
 ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]'))
 ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]'))
+ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]'))
 
 # Get the latest command line tools from https://developer.android.com/studio/index.html
 # Release note: https://developer.android.com/studio/releases/sdk-tools.html
@@ -94,6 +95,12 @@ do
     echo y | $SDKMANAGER "add-ons;$addon_name"
 done
 
+for tool_name in "${ANDROID_ADDITIONAL_TOOLS[@]}"
+do
+    echo "Installing additional tool $tool_name ..."
+    echo y | $SDKMANAGER "$tool_name"
+done
+
 popd
 
 echo "Installing ProGuard-5..."

images/macos/software-report/SoftwareReport.Android.psm1

@@ -50,6 +50,10 @@ function Build-AndroidTable {
             "Package" = "Android SDK Build-tools"
             "Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo
         },
+        @{
+            "Package" = "Android Command Line Tools"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools"
+        },
         @{
             "Package" = "Android SDK Platform-Tools"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools"

images/macos/tests/Android.Tests.ps1

@@ -27,7 +27,8 @@ Describe "Android" {
         $platforms,
         $buildTools,
         (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }),
-        (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" })
+        (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" }),
+        (Get-ToolsetValue "android.additional-tools")
     ) | ForEach-Object { $_ }
 
     BeforeAll {

images/macos/toolsets/toolset-10.14.json

@@ -209,6 +209,9 @@
         ],
         "addon-list": [
             "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
+        ],
+        "additional-tools": [
+            "cmdline-tools;latest"
         ]
     },
     "powershellModules": [

images/macos/toolsets/toolset-10.15.json

@@ -139,6 +139,9 @@
         ],
         "addon-list": [
             "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
+        ],
+        "additional-tools": [
+            "cmdline-tools;latest"
         ]
     },
     "powershellModules": [

images/macos/toolsets/toolset-11.0.json

@@ -72,7 +72,10 @@
         "extra-list": [
             "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager"
         ],
-        "addon-list": []
+        "addon-list": [],
+        "additional-tools": [
+            "cmdline-tools;latest"
+        ]
     },
     "powershellModules": [
         {