From 3b5941f9d0482cc32dd1c4763d0672090d22c45f Mon Sep 17 00:00:00 2001 From: Max Spector Date: Tue, 25 May 2021 11:56:52 -0700 Subject: vm/adb: mount debugfs on Android if it is not mounted On Android 12+ debugfs gets unmounted after boot. This remounts it as part of reset. --- vm/adb/adb.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'vm/adb') diff --git a/vm/adb/adb.go b/vm/adb/adb.go index dc415cced..aeaa8d0c2 100644 --- a/vm/adb/adb.go +++ b/vm/adb/adb.go @@ -291,6 +291,17 @@ func (inst *instance) repair() error { } // Switch to root for userdebug builds. inst.adb("root") + + // Mount debugfs. + if _, err := inst.adb("shell", "ls /sys/kernel/debug/kcov"); err != nil { + log.Logf(2, "debugfs was unmounted mounting") + // This prop only exist on Android 12+ + inst.adb("shell", "setprop persist.dbg.keep_debugfs_mounted 1") + if _, err := inst.adb("shell", "mount -t debugfs debugfs /sys/kernel/debug "+ + "&& chmod 0755 /sys/kernel/debug"); err != nil { + return err + } + } inst.waitForSSH() if inst.cfg.StartupScript != "" { if err := inst.runScript(inst.cfg.StartupScript); err != nil { -- cgit mrf-deployment