commit 187a0651f1c831b57724296581a3e569494eddba
author Alistair Strachan <astrachan@google.com> Wed Apr 17 09:51:32 2019 -0700
committer Alistair Strachan <astrachan@google.com> Sun May 05 16:26:08 2019 -0700
tree 6c7a7cb92a1482a73b9f00cb1ad1b359ddfc1897
parent 270236a353b02807e6da0ab5efb2bfeb5e5723d9

Handle case where gsi_fstab is empty string

The gsi_fstab parameter is only used if a DT is needed by the
environment being booted, but we are about to deprecate the need for the
DT altogether. Make sure we don't try to pass the empty string to
crosvm (just omit the command line flag altogether.)

Bug: 113175337
Change-Id: I3ca110057609e58ce0ebaa47ab5697d2f2ea6211
Merged-In: I3ca110057609e58ce0ebaa47ab5697d2f2ea6211
Signed-off-by: Alistair Strachan <astrachan@google.com>

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 2241b0e..a3b9082 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -82,7 +82,9 @@
   command.AddParameter("--rwdisk=", config_->vendor_image_path());
   command.AddParameter("--rwdisk=", config_->product_image_path());
   command.AddParameter("--socket=", GetControlSocketPath(config_));
-  command.AddParameter("--android-fstab=", config_->gsi_fstab_path());
+  if (!config_->gsi_fstab_path().empty()) {
+    command.AddParameter("--android-fstab=", config_->gsi_fstab_path());
+  }
   command.AddParameter("--single-touch=", config_->touch_socket_path(), ":",
                        config_->x_res(), ":", config_->y_res());
   command.AddParameter("--keyboard=", config_->keyboard_socket_path());