commit 2233bd5f71220d0afc10f3592a3d2f52dbc97efe
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 17 13:33:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 17 13:33:56 2019 +0000
tree 3575d95b1f6464cb1476e6738c86f563921225a1
parent 1074333b007da0126a9b828ab75877946fdd2ed0
parent 858d8c807afb3ef775f235200e809f766386aec6

Merge "Rename VSoCService as CuttlefishService" into cuttlefish-testing

host/commands/launch/flags.cc

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",