Skip to content

Commit 88c93bf

Browse files
committed
Hack around incorrect file match in assemble_cvd
Bug: b/461569369
1 parent 1dfe064 commit 88c93bf

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,18 @@ Result<void> FetchArtifact::ExtractAll(const std::string& local_path) {
127127
}
128128
std::string extract_path = fmt::format(
129129
"{}/{}", fetch_build_context_.target_directory_, local_path);
130-
std::vector<std::string> extracted =
131-
CF_EXPECT(ExtractArchiveContents(downloaded_path_, extract_path, true));
130+
std::vector<std::string> extracted = CF_EXPECT(ExtractArchiveContents(downloaded_path_, extract_path, true));
132131

133-
std::string extract_phase =
134-
fmt::format("Extracted '{}'", fmt::join(extracted, ","));
132+
std::string extract_phase = fmt::format("Extracted '{}'", fmt::join(extracted, ","));
135133
fetch_build_context_.trace_.CompletePhase(std::move(extract_phase));
136134

137135
fetch_build_context_.DesparseFiles(extracted);
138136
for (const std::string& file : extracted) {
139-
CF_EXPECT(fetch_build_context_.AddFileToConfig(file));
137+
// Hack: avoid assemble_cvd incorrect match against `ti50-emulator-kernel`
138+
// file when it looks for files ending in `kernel`. b/461569369#comment2
139+
if (!absl::EndsWith(file, "kernel")) {
140+
CF_EXPECT(fetch_build_context_.AddFileToConfig(file));
141+
}
140142
}
141143
}
142144
return {};

0 commit comments

Comments
 (0)