commit 1e9514422c874409a4b9cbda5ae65ecb72683b45
author Daniel Norman <danielnorman@google.com> Mon Mar 22 09:51:50 2021 -0700
committer Daniel Norman <danielnorman@google.com> Mon Mar 22 10:57:27 2021 -0700
tree 83643446fa1c909da4913e2ab08e0ddced521437
parent 171bb386d02ea27b48728cc615ceb0152e335f8b

Only provides switches server to WebRTC.

VNC does not currently accept the switches socket.

Bug: 183342918
Test: launch_cvd with VNC
Change-Id: Ibe92a4df4bc4454cfb992de94e48696c32aaeb28

host/commands/run_cvd/launch.cc

diff --git a/host/commands/run_cvd/launch.cc b/host/commands/run_cvd/launch.cc
index a4cabca..e2ad127 100644
--- a/host/commands/run_cvd/launch.cc
+++ b/host/commands/run_cvd/launch.cc
@@ -74,7 +74,6 @@
 void CreateStreamerServers(Command* cmd, const CuttlefishConfig& config) {
   SharedFD touch_server;
   SharedFD keyboard_server;
-  SharedFD switches_server;
 
   auto instance = config.ForDefaultInstance();
   if (config.vm_manager() == QemuManager::name()) {
@@ -101,7 +100,8 @@
   }
   cmd->AddParameter("-keyboard_fd=", keyboard_server);
 
-  if (config.vm_manager() == vm_manager::CrosvmManager::name()) {
+  if (config.enable_webrtc() &&
+      config.vm_manager() == vm_manager::CrosvmManager::name()) {
     SharedFD switches_server =
         CreateUnixInputServer(instance.switches_socket_path());
     if (!switches_server->IsOpen()) {

host/libs/vm_manager/crosvm_manager.cpp

diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index f40890f..89cc84d 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -264,6 +264,8 @@
                             ":", display_config.width, ":",
                             display_config.height);
     crosvm_cmd.AddParameter("--keyboard=", instance.keyboard_socket_path());
+  }
+  if (config.enable_webrtc()) {
     crosvm_cmd.AddParameter("--switches=", instance.switches_socket_path());
   }