From d77157a97264b38ec4b862a15a45fdcfe02cdca8 Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Wed, 5 Feb 2025 11:05:22 +0100
Subject: [PATCH] [Ubuntu] add Android SDK Platform-Tools (#11539)

---
 images/ubuntu/scripts/build/install-android-sdk.sh | 3 +++
 images/ubuntu/scripts/tests/Android.Tests.ps1      | 1 +
 2 files changed, 4 insertions(+)

diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh
index 51c9d814..b6928f1e 100644
--- a/images/ubuntu/scripts/build/install-android-sdk.sh
+++ b/images/ubuntu/scripts/build/install-android-sdk.sh
@@ -110,6 +110,9 @@ available_build_tools=$(echo ${all_build_tools[@]//*rc[0-9]/})
 add_filtered_installation_components $minimum_platform_version "${available_platforms[@]}"
 add_filtered_installation_components $minimum_build_tool_version "${available_build_tools[@]}"
 
+# Add platform tools to the list of components to install
+components+=("platform-tools")
+
 # Install components
 echo "y" | $SDKMANAGER ${components[@]}
 
diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1
index ab2ac2c4..b7c26e4e 100644
--- a/images/ubuntu/scripts/tests/Android.Tests.ps1
+++ b/images/ubuntu/scripts/tests/Android.Tests.ps1
@@ -72,6 +72,7 @@ Describe "Android" {
         $platformsInstalled,
         $buildTools,
         $ndkFullVersions,
+        "platform-tools",
         ((Get-ToolsetContent).android.extra_list | ForEach-Object { "extras/${_}" }),
         ((Get-ToolsetContent).android.addon_list | ForEach-Object { "add-ons/${_}" }),
         ((Get-ToolsetContent).android.additional_tools | ForEach-Object { "${_}" })