diff options
| author | Daniel Norman <danielnorman@google.com> | 2020-06-26 16:08:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 16:08:16 +0000 |
| commit | 649330b59fd2807f4ce0a2b1e3d8d7bc0883ab86 (patch) | |
| tree | f9359250880e8820a7f15d46850f4e645b3f7870 | |
| parent | b1d75ff0aeec6a21c99ec338b6581ef128950361 (diff) | |
| parent | c45a501e88d45d4c75903d08a4c4ef9f5328cbf5 (diff) | |
| download | cuttlefish-649330b59fd2807f4ce0a2b1e3d8d7bc0883ab86.tar.gz | |
Only include and run VHAL server if it exists. am: c45a501e88
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/12001042
Change-Id: Ibfd7113aa2a0807173624aaefd311f00bf5c7890
| -rw-r--r-- | host/commands/run_cvd/kernel_args.cc | 4 | ||||
| -rw-r--r-- | host/commands/run_cvd/launch.cc | 3 | ||||
| -rw-r--r-- | host_package.mk | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/host/commands/run_cvd/kernel_args.cc b/host/commands/run_cvd/kernel_args.cc index af77420f1..308ef8a7c 100644 --- a/host/commands/run_cvd/kernel_args.cc +++ b/host/commands/run_cvd/kernel_args.cc @@ -21,6 +21,7 @@ #include <string> #include <vector> +#include "common/libs/utils/files.h" #include "host/commands/run_cvd/launch.h" #include "host/commands/run_cvd/runner_defs.h" #include "host/libs/config/cuttlefish_config.h" @@ -87,7 +88,8 @@ std::vector<std::string> KernelCommandLineFromConfig(const vsoc::CuttlefishConfi kernel_cmdline.push_back("androidboot.force_normal_boot=1"); } - if (config.enable_vehicle_hal_grpc_server() && instance.vehicle_hal_server_port()) { + if (config.enable_vehicle_hal_grpc_server() && instance.vehicle_hal_server_port() && + cvd::FileExists(config.vehicle_hal_grpc_server_binary())) { constexpr int vehicle_hal_server_cid = 2; kernel_cmdline.push_back(concat("androidboot.vendor.vehiclehal.server.cid=", vehicle_hal_server_cid)); kernel_cmdline.push_back(concat("androidboot.vendor.vehiclehal.server.port=", instance.vehicle_hal_server_port())); diff --git a/host/commands/run_cvd/launch.cc b/host/commands/run_cvd/launch.cc index 93d600fb9..5ae66a9d6 100644 --- a/host/commands/run_cvd/launch.cc +++ b/host/commands/run_cvd/launch.cc @@ -343,7 +343,8 @@ void LaunchSocketVsockProxyIfEnabled(cvd::ProcessMonitor* process_monitor, 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; } diff --git a/host_package.mk b/host_package.mk index 419e0c544..1b607f3ef 100644 --- a/host_package.mk +++ b/host_package.mk @@ -19,7 +19,6 @@ webrtc_files_path := usr/share/webrtc cvd_host_executables := \ adb \ adbshell \ - android.hardware.automotive.vehicle@2.0-virtualization-grpc-server \ launch_cvd \ lpmake \ lpunpack \ @@ -60,6 +59,10 @@ cvd_host_executables := \ tapsetiff \ newfs_msdos \ +ifneq ($(wildcard device/google/trout),) + cvd_host_executables += android.hardware.automotive.vehicle@2.0-virtualization-grpc-server +endif + cvd_host_tests := \ monotonic_time_test \ cuttlefish_net_tests \ |