Set the global default adb mode to vsock_half_tunnel.
Test: Run with -vm_manager=crosvm, -vm_manager=qemu_cli
Bug: 130565669
Change-Id: Ia5e1fc4dc1062580daec803efef3679fae28dbd2
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index be4b33f..80e525e 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -130,7 +130,7 @@
DEFINE_string(socket_vsock_proxy_binary,
vsoc::DefaultHostArtifactsPath("bin/socket_vsock_proxy"),
"Location of the socket_vsock_proxy binary.");
-DEFINE_string(adb_mode, "",
+DEFINE_string(adb_mode, "vsock_half_tunnel",
"Mode for ADB connection. Can be 'usb' for USB forwarding, "
"'tunnel' for a TCP connection tunneled through VSoC, "
"'vsock_tunnel' for a TCP connection tunneled through vsock, "
@@ -489,8 +489,6 @@
google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("hardware_name", "cutf_ivsh",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- SetCommandLineOptionWithMode("adb_mode", "tunnel",
- google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("decompress_kernel", "false",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("logcat_mode", cvd::kLogcatSerialMode,
@@ -522,8 +520,6 @@
google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("hardware_name", "cutf_cvm",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- SetCommandLineOptionWithMode("adb_mode", "vsock_tunnel",
- google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("decompress_kernel", "true",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("run_e2e_test", "false",