From 58ec9a5403883947c3b36c8a730676723547f346 Mon Sep 17 00:00:00 2001 From: Dan Fabulich Date: Wed, 4 Feb 2026 15:05:13 -0800 Subject: [PATCH] Use `adb` from `$ANDROID_HOME/platform-tools` Fixes #178 --- Sources/SkipBuild/SkipCommand.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Sources/SkipBuild/SkipCommand.swift b/Sources/SkipBuild/SkipCommand.swift index 47cc28ad..447dac34 100644 --- a/Sources/SkipBuild/SkipCommand.swift +++ b/Sources/SkipBuild/SkipCommand.swift @@ -1037,7 +1037,13 @@ struct ToolOptions: ParsableArguments { case "swift": return self.swift ?? ProcessInfo.processInfo.environment["SKIP_SWIFT_PATH"] case "xcodebuild": return self.xcodebuild ?? ProcessInfo.processInfo.environment["SKIP_XCODEBUILD_PATH"] case "gradle": return self.gradle ?? ProcessInfo.processInfo.environment["SKIP_GRADLE_PATH"] - case "adb": return self.adb ?? ProcessInfo.processInfo.environment["SKIP_ADB_PATH"] + case "adb": + if let adb = self.adb ?? ProcessInfo.processInfo.environment["SKIP_ADB_PATH"] { return adb } + if let androidHome = ProcessInfo.androidHome, + FileManager.default.fileExists(atPath: "\(androidHome)/platform-tools/adb") { + return "\(androidHome)/platform-tools/adb" + } + return nil case "emulator": return self.emulator ?? ProcessInfo.processInfo.environment["SKIP_EMULATOR_PATH"] ?? self.emulatorBinary case "java": return ProcessInfo.processInfo.environment["JAVA_HOME"]?.appending("/bin/java") ?? ProcessInfo.defaultJavaHome.appending("/bin/java") default: return nil