commit 6daf7a776622988ff2deda91c90f1e9faeab7f8c
author Cody Schuffelen <schuffelen@google.com> Tue Jan 29 16:56:08 2019 -0800
committer Cody Schuffelen <schuffelen@google.com> Thu Jan 31 17:28:16 2019 -0800
tree 28efb9d9b42bf41110e8f162ea1fd639410c4c05
parent 5024973edb00824321b82485e3078319160bf9ba

Change flag defaults instead of reassigning them.

Uses SetCommandLineOptionWithMode in ResolveInstanceFiles, similar to
SetDefaultFlagsForQemu.

Bug: 123592422
Test: build and run locally
Change-Id: I692bc68a87380c801ec5bd0fe6d65f4db4f88169

host/commands/launch/main.cc

diff --git a/host/commands/launch/main.cc b/host/commands/launch/main.cc
index 05d14d6..7da6c07 100644
--- a/host/commands/launch/main.cc
+++ b/host/commands/launch/main.cc
@@ -335,21 +335,21 @@
 
   // If user did not specify location of either of these files, expect them to
   // be placed in --system_image_dir location.
-  if (FLAGS_system_image.empty()) {
-    FLAGS_system_image = FLAGS_system_image_dir + "/system.img";
-  }
-  if (FLAGS_boot_image.empty()) {
-    FLAGS_boot_image = FLAGS_system_image_dir + "/boot.img";
-  }
-  if (FLAGS_cache_image.empty()) {
-    FLAGS_cache_image = FLAGS_system_image_dir + "/cache.img";
-  }
-  if (FLAGS_data_image.empty()) {
-    FLAGS_data_image = FLAGS_system_image_dir + "/userdata.img";
-  }
-  if (FLAGS_vendor_image.empty()) {
-    FLAGS_vendor_image = FLAGS_system_image_dir + "/vendor.img";
-  }
+  std::string default_system_image = FLAGS_system_image_dir + "/system.img";
+  SetCommandLineOptionWithMode("system_image", default_system_image.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
+  std::string default_boot_image = FLAGS_system_image_dir + "/boot.img";
+  SetCommandLineOptionWithMode("boot_image", default_boot_image.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
+  std::string default_cache_image = FLAGS_system_image_dir + "/cache.img";
+  SetCommandLineOptionWithMode("cache_image", default_cache_image.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
+  std::string default_data_image = FLAGS_system_image_dir + "/userdata.img";
+  SetCommandLineOptionWithMode("data_image", default_data_image.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
+  std::string default_vendor_image = FLAGS_system_image_dir + "/vendor.img";
+  SetCommandLineOptionWithMode("vendor_image", default_vendor_image.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
 
   // Create data if necessary
   if (!ApplyDataImagePolicy(FLAGS_data_image.c_str(),