Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add newer cmd linetools paths to cake #24828

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion eng/devices/android.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading