Skip to content

Commit 40e1723

Browse files
committed
Temporarily force substitution of cvdalloc.
Do this for two reasons: * since the substitution marker file is not updated, cvdalloc must be substituted by flag during a `cvd fetch`. This also means since cvdalloc is not copied back to the Android repository, cvdalloc is missing even when substitution to override (e.g., during development) is not desired * updating the substitution marker file in Android is causing other unrelated failures not detected by presubmit, and is blocking rollout progress. Once the substitution marker file change is completed safely, we can revert this change. Forced substitution like this should be safe, since cvdalloc is packaged normally, and substitution unlinks if the target already exists.
1 parent 49c1445 commit 40e1723

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

base/cvd/cuttlefish/host/commands/cvd/fetch/substitute.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@ Result<void> HostPackageSubstitution(
185185
LOG(INFO) << "using local debian substitution marker file: " << marker_file;
186186
}
187187

188+
// TODO: remove when we can safely add this to the marker file.
189+
std::string cvdalloc_src =
190+
fmt::format("{}/bin/{}", CF_EXPECT(GetCuttlefishCommonDir()), "cvdalloc");
191+
std::string cvdalloc_name = fmt::format("{}/{}", target_dir, "cvdalloc");
192+
CF_EXPECT(Substitute(cvdalloc_src, cvdalloc_name));
193+
188194
if (host_substitutions.empty() && FileExists(marker_file)) {
189195
CF_EXPECT(SubstituteWithMarker(target_dir, marker_file));
190196
} else {

0 commit comments

Comments
 (0)