From 1cd5c18eecef98f77964bdce28a9b18068e2ec84 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Mon, 1 Feb 2021 20:15:30 +0300
Subject: [PATCH] [Ubuntu] Get back Android NDK to the readme  (#2601)

* add Get-AndroidNDKVersions function

* simplify Get-AndroidNDKVersions function

* remove $versions variable definition
---
 .../scripts/SoftwareReport/SoftwareReport.Android.psm1     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
index 3234689b3..f5684535e 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
@@ -78,7 +78,7 @@ function Build-AndroidTable {
         },
         @{
             "Package" = "NDK"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
+            "Version" = Get-AndroidNDKVersions
         },
         @{
             "Package" = "SDK Patch Applier v4"
@@ -154,3 +154,8 @@ function Get-AndroidGoogleAPIsVersions {
     return ($versions -Join "<br>")
 }
 
+function Get-AndroidNDKVersions {
+    $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
+    $versions = Get-ChildItem -Path $ndkFolderPath -Name
+    return ($versions -Join "<br>")
+}
\ No newline at end of file