commit 3ff44c3f9b9445031eb3a5d10d3ee2e66d5f0132
author Cody Schuffelen <schuffelen@google.com> Wed Apr 17 15:03:58 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 17 15:03:58 2019 -0700
tree 95f61452add325074caa2bb949326e301c661a7b
parent cff7e74e83f5042e5f340443d6b8270a83811600
parent 25d050f7058b7f146affac5e612f266773358a64

Set the global default adb mode to vsock_half_tunnel.
am: 25d050f705

Change-Id: Ic917ccc2dbd20172ca26e04ac14cf5bafdc9154d

host/commands/launch/flags.cc

diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index 1387f30..d1d7d21 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -124,7 +124,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, "
@@ -472,8 +472,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,
@@ -500,8 +498,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",