From e113e2f6b829f0e6fd528b93a1241c52410873a2 Mon Sep 17 00:00:00 2001
From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:17:43 +0200
Subject: [PATCH] [macos] introduce toolset possibility to install Android SDK
 Tools (#8573)

---
 images/macos/provision/core/android-toolsets.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh
index 3e4efc66..5673ad33 100755
--- a/images/macos/provision/core/android-toolsets.sh
+++ b/images/macos/provision/core/android-toolsets.sh
@@ -121,4 +121,13 @@ do
     echo y | $SDKMANAGER "$tool_name"
 done
 
+# Download SDK tools to preserve backward compatibility
+sdkTools="android-sdk-tools.zip"
+sdkToolsVersion=$(get_toolset_value '.android."sdk-tools"')
+if [ "$sdkToolsVersion" != "null" ]; then
+    download_with_retries "https://dl.google.com/android/repository/${sdkToolsVersion}" "." $sdkTools
+    unzip -qq $sdkTools -d ${ANDROID_SDK_ROOT}
+    rm -f $sdkTools
+fi
+
 invoke_tests "Android"