commit 30803281022a44ff3e19c428d4c272990f5c7d78
author Kiyoung Kim <kiyoungkim@google.com> Tue Jul 07 14:10:50 2020 +0900
committer Alistair Delva <adelva@google.com> Mon Jul 13 02:16:16 2020 +0000
tree f46fe4aed1a722b801ff235f02fc2ce22efb8859
parent 9e44111074b2c5ba4e974f7c6f768f8c32dcbe26

Update condition to launch Vehicle HAL

Currently cvd launches when the property is set or GRPC server
executable binary exists. However, this also makes cvd to execute GRPC
server even when property is set and GRPC server does not exists. This
change updates the configuration to not execute GRPC server when the
property is set and binary does not exists.

Bug: 159905153
Bug: 160456961
Test: Tested from environment without GRPC server
[adelva: use merged-in from different change as this fixes a bug
         introduced in the cherry-pick to rvc-dev]
Change-Id: Id25ac713292373bbaea3d09ff5a24123cea4aba5
Merged-In: Ib69cbee32389520536248074b0899dedf0979de0

host/commands/run_cvd/launch.cc

diff --git a/host/commands/run_cvd/launch.cc b/host/commands/run_cvd/launch.cc
index 5ae66a9..faa04a6 100644
--- a/host/commands/run_cvd/launch.cc
+++ b/host/commands/run_cvd/launch.cc
@@ -343,7 +343,7 @@
 
 void LaunchVerhicleHalServerIfEnabled(const vsoc::CuttlefishConfig& config,
                                                         cvd::ProcessMonitor* process_monitor) {
-    if (!config.enable_vehicle_hal_grpc_server() &&
+    if (!config.enable_vehicle_hal_grpc_server() ||
         !cvd::FileExists(config.vehicle_hal_grpc_server_binary())) {
         return;
     }