From 3e1fdc417b13fec160c932331fea9da666a064ba Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 30 Dec 2020 13:29:15 +0500 Subject: [PATCH] [windows] Add Android Comand Line tools (#2362) --- images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 | 4 ++++ images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index d524c10fc..98475a036 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -42,6 +42,10 @@ function Build-AndroidTable { "Package" = "Android SDK Tools" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools" }, + @{ + "Package" = "Android Command Line Tools" + "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools" + }, @{ "Package" = "Android SDK Platforms" "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 62086ece9..fd791981b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -162,7 +162,8 @@ "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle" + "ndk-bundle", + "cmdline-tools;latest" ] }, "visualStudio": { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6d2df7f41..14d08b46a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -162,7 +162,8 @@ "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle" + "ndk-bundle", + "cmdline-tools;latest" ] }, "visualStudio": {