Respect the adb mode set on the launcher flag, regardless of vmm.
Some modes (usb and tcp proxy over vsoc) were being disabled for
crosvm even if the user had requested them via flag, this change
removes that behavior. The flags have sensible default values in any
case.
Bug: 122978436
Test: run & build locally
Change-Id: Icd9f16980dc65992f33f9d99e2698ff5d7fbd3d2
diff --git a/host/commands/launch/launch.cc b/host/commands/launch/launch.cc
index 37ce5a3..768469a 100644
--- a/host/commands/launch/launch.cc
+++ b/host/commands/launch/launch.cc
@@ -47,7 +47,7 @@
}
bool AdbTunnelEnabled(const vsoc::CuttlefishConfig& config) {
- return VSoCEnabled(config) && AdbModeEnabled(config, kAdbModeTunnel);
+ return AdbModeEnabled(config, kAdbModeTunnel);
}
bool AdbVsockTunnelEnabled(const vsoc::CuttlefishConfig& config) {
@@ -76,7 +76,7 @@
}
bool AdbUsbEnabled(const vsoc::CuttlefishConfig& config) {
- return VSoCEnabled(config) && AdbModeEnabled(config, kAdbModeUsb);
+ return AdbModeEnabled(config, kAdbModeUsb);
}
void ValidateAdbModeFlag(const vsoc::CuttlefishConfig& config) {
