Add build-tools and aapt discovery. (#10)

gojuno · Nov 16, 2017 · 1bdeb6e · 1bdeb6e
1 parent 8a36190
commit 1bdeb6e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt b/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt
@@ -13,6 +13,14 @@ import java.util.concurrent.TimeUnit.SECONDS
 
 val androidHome: String by lazy { System.getenv("ANDROID_HOME") }
 val adb: String by lazy { "$androidHome/platform-tools/adb" }
+private val buildTools: String? by lazy {
+    File(androidHome, "build-tools")
+            .listFiles()
+            .sortedArray()
+            .lastOrNull()
+            ?.absolutePath
+}
+val aapt: String by lazy { buildTools?.let { "$buildTools/aapt" } ?: "" }
 
 fun connectedAdbDevices(): Observable<Set<AdbDevice>> = process(listOf(adb, "devices"), unbufferedOutput = true)
         .ofType(Notification.Exit::class.java)