From 351718d10bc0ad485132856a27f7e56efe011bb6 Mon Sep 17 00:00:00 2001
From: "John \"codefu\" McDole" <codefu@google.com>
Date: Thu, 29 May 2025 20:08:34 -0700
Subject: [PATCH] fix: update experiment to use different setup (#169728)

Use android-actions/setup-android even if its more verbose.
---
 .github/workflows/tool-test-general.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tool-test-general.yml b/.github/workflows/tool-test-general.yml
index 72d93fb124f..d5ac61e463f 100644
--- a/.github/workflows/tool-test-general.yml
+++ b/.github/workflows/tool-test-general.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches: [master]
     paths:
+      - '.github/workflows/tool-test-general.yml'
       - 'dev/**'
       - 'packages/flutter_tools/**'
       - 'bin/**'
@@ -32,9 +33,15 @@ jobs:
       # The following step is only run LOCALLY - Github runners have everything on them
       - name: Setup Android SDK
         if: ${{ env.ACT }}
-        uses: amyu/setup-android@v4
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407
         with:
-          sdk-version: 36
+          cmdline-tools-version: 13114758
+
+      # The following step is only run LOCALLY - Github runners have everything on them
+      - name: install android
+        if: ${{ env.ACT }}
+        run: |
+          sdkmanager "platform-tools" "platforms;android-36" "build-tools;36.0.0"
 
       - name: Checkout code
         uses: actions/checkout@v4