Add ADB (Android Debug Bridge) Support #1564
Conversation
ep1cman
force-pushed
the
adb
branch
2 times, most recently
from
d234f34 to
15a4ce4
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1564 +/- ##
========================================
- Coverage 45.4% 45.1% -0.3%
========================================
Files 172 174 +2
Lines 13500 13681 +181
========================================
+ Hits 6130 6183 +53
- Misses 7370 7498 +128
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
ep1cman
force-pushed
the
adb
branch
4 times, most recently
from
e346334 to
892693a
Compare
labgrid/remote/client.py
Outdated
| if resource.extra.get("proxy_required") or self.args.proxy: | ||
| proxy = resource.extra.get("proxy") | ||
| scrcpy_cmd.append(f"--tunnel-host={ip_addr}") | ||
| scrcpy_cmd.append(f"--tunnel-port={sshmanager.request_forward(proxy, host, 27183)}") |
There was a problem hiding this comment.
Is this always the same port? How will this interact with multiple devices connected over ADB to the same host?
There was a problem hiding this comment.
Good point, I had not tested multiple simultaneous screen sharing sessions. I have added some code to find a free port on the exporter and use that. It is based on the "get_free_port" code within labgrid that gets a free port on the client machine.
Is this worth moving into a more general location? Maybe within SSHConnection?
There was a problem hiding this comment.
get_free_port should already be in util.helper, so you should be able to import it directly.
There was a problem hiding this comment.
That returns a free port on the machine running the labgrid client, I require a free port on the exporter. The way scrcpy works is that it runs a server on the android device and creates a port forward between it and the ADB host (the exporter in this case)
There was a problem hiding this comment.
You might be able to handle that within the remote resource for the exporter, the SerialPortExport does something similar to choose a free port for ser2net.
There was a problem hiding this comment.
There is an additional complication to the scrcpy command.
I already use get_free_port in the ADBExport to get a port for the ADB server, which is started by the ADBExport.
The scrcpy server is not setup at this time, it is started by the scrcpy client when it connects to the device. It first connects via ADB, transfers over the binaries, starts the server, then uses ADB to create a port forward between the device and the ADB host (the exporter).
I am unable to know at the time of starting the exporter what ports will be available at the time scrcpy is launched, which could be weeks later.
|
Any updates on this? It would be great to get this merged. |
ep1cman
force-pushed
the
adb
branch
3 times, most recently
from
8b27627 to
33c3683
Compare
Some forms of reset can reset the device into different modes. For example: - Reboot - Reboot into bootloader mode - Reboot into recovery mode Signed-off-by: Sebastian Goscik <[email protected]>
ADB is expected to be installed and working on the exporter and client machines. For screensharing "scrcpy" needs to be installed on the client. Signed-off-by: Sebastian Goscik <[email protected]>
|
@Emantor I believe there was one remaining comment thread, I provided an explanation for why I did things that way, awaiting your feedback. I have update the PR to resolve merge conflicts with the latest master branch. |
This pull request add support for ADB (Android Debug Bridge) devices in labgrid.
adbfor interfacing with the device by theadbcliscrcpyfor remote screen/touch/keyboard/clipboard/etc. sharingChecklist