Skip to content

Revert "Substitute all artifacts when the build has the debian_substitution_marker present." #2548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rmuthiah wants to merge 1 commit into from
Closed

Revert "Substitute all artifacts when the build has the debian_substitution_marker present." #2548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/substitute.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,32 +161,28 @@ Result<void> SubstituteWithMarker(const std::string& target_dir,
Result<void> HostPackageSubstitution(
const std::string& target_dir,
const std::vector<std::string>& host_substitutions) {

// TODO: remove when we can safely add this to the marker file.
std::string cvdalloc_src =
fmt::format("{}/bin/{}", CF_EXPECT(GetCuttlefishCommonDir()), "cvdalloc");
std::string cvdalloc_name = fmt::format("{}/bin/{}", target_dir, "cvdalloc");
CF_EXPECT(Substitute(cvdalloc_src, cvdalloc_name));

// [DEVELOPMENT ONLY] Substitute when `--host_substitutions` flag is used.
if (!host_substitutions.empty()) {
return SubstituteWithFlag(target_dir, host_substitutions);
}

// [DEVELOPMENT ONLY] Substitute when LOCAL_DEBIAN_SUBSTITUTION_MARKER_FILE is set.
std::string marker_file = target_dir + "/etc/debian_substitution_marker";
// Use a local debian_substitution_marker file for development purposes.
std::optional<std::string> local_marker_file =
StringFromEnv("LOCAL_DEBIAN_SUBSTITUTION_MARKER_FILE");
if (local_marker_file.has_value()) {
std::string marker_file = local_marker_file.value();
marker_file = local_marker_file.value();
CF_EXPECTF(FileExists(marker_file),
"local debian substitution marker file does not exist: {}",
marker_file);
LOG(INFO) << "using local debian substitution marker file: " << marker_file;
return SubstituteWithMarker(target_dir, marker_file);
}

if (FileExists(target_dir + "/etc/debian_substitution_marker")) {
return SubstituteWithFlag(target_dir, {"all"});
// TODO: remove when we can safely add this to the marker file.
std::string cvdalloc_src =
fmt::format("{}/bin/{}", CF_EXPECT(GetCuttlefishCommonDir()), "cvdalloc");
std::string cvdalloc_name = fmt::format("{}/bin/{}", target_dir, "cvdalloc");
CF_EXPECT(Substitute(cvdalloc_src, cvdalloc_name));

if (host_substitutions.empty() && FileExists(marker_file)) {
CF_EXPECT(SubstituteWithMarker(target_dir, marker_file));
} else {
CF_EXPECT(SubstituteWithFlag(target_dir, host_substitutions));
}

return {};
Expand Down
Loading