Skip to content

Commit

Permalink
Fixed hang when installing on android
Browse files Browse the repository at this point in the history
  • Loading branch information
yglukhov committed Jan 19, 2021
1 parent efdd2e5 commit e464ada
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions nimx/naketools.nim
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ proc gradleBuild(b: Builder) =
withDir(b.buildRoot / b.javaPackageId):
putEnv "ANDROID_HOME", expandTilde(b.androidSdk)
var args = @[getCurrentDir() / "gradlew"]
args.add(["--warning-mode", "all"])
if b.debugMode:
args.add("assembleDebug")
else:
Expand Down Expand Up @@ -971,6 +972,9 @@ proc adbServerName(b: Builder): string =
if result.len == 0: result = "localhost"

proc getConnectedAndroidDevices*(b: Builder): seq[string] =
# The readLine loop can hang if adb is run without starting the adb server,
# so we start the server upfront.
if b.adbServerName == "localhost": direShell b.adbExe, "start-server"
let logcat = startProcess(b.adbExe, args = ["-H", b.adbServerName, "devices"])
let so = logcat.outputStream
var line = ""
Expand All @@ -987,6 +991,7 @@ proc installAppOnConnectedDevice(b: Builder, devId: string) =
var apkPath = b.buildRoot / b.javaPackageId / "build" / "outputs" / "apk" / conf / b.javaPackageId & "-" & conf & ".apk"

direShell b.adbExe, "-H", b.adbServerName, "-s", devId, "install", "-r", apkPath
# direShell b.adbExe, "-H", b.adbServerName, "-s", devId, "install", "--abi", "armeabi-v7a", "-r", apkPath
if b.runAfterBuild:
var activityName = b.javaPackageId & "/" & b.activityClassName
direShell b.adbExe, "shell", "am", "start", "-n", activityName
Expand Down

0 comments on commit e464ada

Please sign in to comment.