From c41c712770a4df4e0859e582afc2628e8bfbee0c Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 19 Sep 2024 06:23:44 -0400
Subject: [PATCH] Add newer cmd linetools paths to cake

---
 eng/devices/android.cake | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/eng/devices/android.cake b/eng/devices/android.cake
index 0077a33a9ff0..8d27db4d6b6b 100644
--- a/eng/devices/android.cake
+++ b/eng/devices/android.cake
@@ -376,7 +376,17 @@ void PerformCleanupIfNeeded(bool cleanupEnabled)
 void SetAndroidEnvironmentVariables(string sdkRoot)
 {
 	// Set up Android SDK environment variables and paths
-	string[] paths = { $"{sdkRoot}/tools/bin", $"{sdkRoot}/cmdline-tools/latest/bin", $"{sdkRoot}/cmdline-tools/5.0/bin", $"{sdkRoot}/cmdline-tools/7.0/bin", $"{sdkRoot}/platform-tools", $"{sdkRoot}/emulator" };
+	string[] paths = { 
+		$"{sdkRoot}/tools/bin", 
+		$"{sdkRoot}/cmdline-tools/latest/bin", 
+		$"{sdkRoot}/cmdline-tools/5.0/bin", 
+		$"{sdkRoot}/cmdline-tools/7.0/bin", 
+		$"{sdkRoot}/cmdline-tools/11.0/bin", 
+		$"{sdkRoot}/cmdline-tools/12.0/bin",
+		$"{sdkRoot}/cmdline-tools/13.0/bin",
+		$"{sdkRoot}/platform-tools", 
+		$"{sdkRoot}/emulator" };
+		
 	foreach (var path in paths)
 	{
 		SetEnvironmentVariable("PATH", path, prepend: true);