diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-06 03:35:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-06 03:35:35 +0000 |
| commit | 6c5146e846620c9c8dba37ce6f7ea3ccdd03dbb5 (patch) | |
| tree | e4e534ea179198f48ddcc44e79be30594c69dec3 | |
| parent | 3a0f99c9e6ed8f070051c8e94d33622bd826eab3 (diff) | |
| parent | 10d52909b5375daf09a5024eb2b4ff98a8daa5a2 (diff) | |
| download | cuttlefish-temp_319669529.tar.gz | |
Merge "mcu: substitute ${bin} config entries to Android host binary path" into main am: 10d52909b5temp_319669529
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2986680
Change-Id: Ifd0b480a22800d20b1c54364fd96827f0ed37736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | host/commands/run_cvd/launch/mcu.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/commands/run_cvd/launch/mcu.cpp b/host/commands/run_cvd/launch/mcu.cpp index 96e426e7d..8076abebd 100644 --- a/host/commands/run_cvd/launch/mcu.cpp +++ b/host/commands/run_cvd/launch/mcu.cpp @@ -62,12 +62,14 @@ class Mcu : public vm_manager::VmmDependencyCommand { CF_EXPECT(start.type() == Json::arrayValue, "mcu: config: start-cmd: array expected"); CF_EXPECT(start.size() > 0, "mcu: config: empty start-cmd"); - Command command(start[0].asString()); + Command command(android::base::StringReplace(start[0].asString(), "${bin}", + HostBinaryPath(""), true)); - std::string wdir = "${wdir}"; for (unsigned int i = 1; i < start.size(); i++) { auto param = start[i].asString(); param = android::base::StringReplace(param, "${wdir}", mcu_dir_, true); + param = android::base::StringReplace(param, "${bin}", HostBinaryPath(""), + true); command.AddParameter(param); } |