From 651175bfdc49107ac8b4a4012be1e5c2c704e506 Mon Sep 17 00:00:00 2001
From: Aspen <4019381+imaspen@users.noreply.github.com>
Date: Tue, 16 Dec 2025 11:33:39 +0000
Subject: [PATCH 1/2] feat: add installed optional sdk tools to path

---
 hooks/env_keys.lua | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/hooks/env_keys.lua b/hooks/env_keys.lua
index 6b4ef47..ac7ef14 100644
--- a/hooks/env_keys.lua
+++ b/hooks/env_keys.lua
@@ -11,7 +11,7 @@ function PLUGIN:EnvKeys(ctx)
     -- Structure is: install_path/cmdline-tools/VERSION/bin
     local bin_path = file.join_path(install_path, "cmdline-tools", version, "bin")
 
-    return {
+    local env_vars = {
         {
             key = "PATH",
             value = bin_path,
@@ -25,4 +25,18 @@ function PLUGIN:EnvKeys(ctx)
             value = install_path,
         },
     }
+
+    -- Add tools installed with sdkmanager to PATH, if they exist
+    local optional_bin_paths = {"platform-tools", "emulator"}
+    for _, realtive_optional_bin_path in ipairs(optional_bin_paths) do
+        local optional_bin_path = file.join_path(install_path, realtive_optional_bin_path)
+        if file.exists(optional_bin_path) then
+            table.insert(env_vars, {
+                key = "PATH",
+                value = optional_bin_path
+            })
+        end
+    end
+
+    return env_vars
 end

From 46c7d8106f5ee8950ad0270ecd9e5e0d59b1317d Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdx@users.noreply.github.com>
Date: Thu, 16 Jul 2026 13:12:07 -0700
Subject: [PATCH 2/2] test: verify optional android sdk tools on path

---
 .github/workflows/test.yml | 2 ++
 hooks/env_keys.lua         | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 14071db..c3c2bd8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,8 @@ jobs:
           mise list-all android-sdk
           mise install android-sdk@13.0
           mise exec android-sdk@13.0 -- sdkmanager --version
+          echo y | mise exec android-sdk@13.0 -- sdkmanager platform-tools
+          mise exec android-sdk@13.0 -- adb version
 
   unit-test:
     runs-on: ubuntu-latest
diff --git a/hooks/env_keys.lua b/hooks/env_keys.lua
index ac7ef14..807daf6 100644
--- a/hooks/env_keys.lua
+++ b/hooks/env_keys.lua
@@ -27,13 +27,13 @@ function PLUGIN:EnvKeys(ctx)
     }
 
     -- Add tools installed with sdkmanager to PATH, if they exist
-    local optional_bin_paths = {"platform-tools", "emulator"}
-    for _, realtive_optional_bin_path in ipairs(optional_bin_paths) do
-        local optional_bin_path = file.join_path(install_path, realtive_optional_bin_path)
+    local optional_bin_paths = { "platform-tools", "emulator" }
+    for _, relative_optional_bin_path in ipairs(optional_bin_paths) do
+        local optional_bin_path = file.join_path(install_path, relative_optional_bin_path)
         if file.exists(optional_bin_path) then
             table.insert(env_vars, {
                 key = "PATH",
-                value = optional_bin_path
+                value = optional_bin_path,
             })
         end
     end