commit 531e47bcc99619fd64ac135e587f1d16c6bd90e4
author Greg Hartman <ghartman@google.com> Fri May 10 01:11:36 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 10 01:11:36 2019 +0000
tree b8b4cbd7d2e704db698a18f72eeaf0cc72ea606b
parent 34845bdc6dbb4b1f105cb3d57298c9c5a9d1f556
parent bc1bed4450f45fe53b3221367055743047a63ed6

Merge "Allow the launcher to select the GLES implementation" into cuttlefish-testing

host/libs/config/cuttlefish_config.cpp

diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index ab6f2da..55f0891 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -618,7 +618,7 @@
   // TODO(schuffelen): Deal with duplication between here and launch.cc
   bool tunnelMode = adb_mode().count("tunnel") > 0;
   bool vsockTunnel = adb_mode().count("vsock_tunnel") > 0;
-  bool vsockHalfProxy = adb_mode().count("vsock_half_proxy") > 0;
+  bool vsockHalfProxy = adb_mode().count("vsock_half_tunnel") > 0;
   bool nativeVsock = adb_mode().count("native_vsock") > 0;
   if (tunnelMode || vsockTunnel || vsockHalfProxy || nativeVsock) {
     return adb_ip_and_port();