diff options
| author | A. Cody Schuffelen <schuffelen@google.com> | 2024-04-26 11:11:33 -0700 |
|---|---|---|
| committer | Cody Schuffelen <schuffelen@google.com> | 2024-04-26 18:59:08 +0000 |
| commit | 195a80d705073aeb573f2a12cc27722a5a678fbe (patch) | |
| tree | b8fdf38902385c3a6ce8513acc5cff2879fb2709 | |
| parent | c70ced19e0f3c36d07c4eee9a771a5ef51d64f62 (diff) | |
| download | cuttlefish-195a80d705073aeb573f2a12cc27722a5a678fbe.tar.gz | |
Support ,:;|/\+ separators for secure_hals
Passing commas is inconvenient in the environment that invokes this.
Extend the delimeter list to a grab bag of options that hopefully
includes a support one.
Test: launch_cvd --secure_hals=oemlock:guest_insecure_keymint:guest_insecure_gatekeeper
Change-Id: If8989783ac1dcf42a7eb7fb0e330dffc10850def
Bug: 332977378
| -rw-r--r-- | host/commands/assemble_cvd/flags.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc index a65f47fbf..531e890e0 100644 --- a/host/commands/assemble_cvd/flags.cc +++ b/host/commands/assemble_cvd/flags.cc @@ -979,7 +979,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration( tmp_config_obj.set_vm_manager(vm_manager_vec[0]); tmp_config_obj.set_ap_vm_manager(vm_manager_vec[0] + "_openwrt"); - auto secure_hals_strs = android::base::Split(FLAGS_secure_hals, ","); + auto secure_hals_strs = + android::base::Tokenize(FLAGS_secure_hals, ",:;|/\\+"); tmp_config_obj.set_secure_hals( std::set<std::string>(secure_hals_strs.begin(), secure_hals_strs.end())); auto secure_hals = tmp_config_obj.secure_hals(); |