Hack around incorrect file match in assemble_cvd

Databean · Databean · commit 32d42ec15a74 · 2025-11-18T13:59:17.000-08:00
Bug: b/461569369
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.cc b/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.cc
@@ -136,7 +136,11 @@ Result<void> FetchArtifact::ExtractAll(const std::string& local_path) {
 
     fetch_build_context_.DesparseFiles(extracted);
     for (const std::string& file : extracted) {
-      CF_EXPECT(fetch_build_context_.AddFileToConfig(file));
+      // Hack: avoid assemble_cvd incorrect match against `ti50-emulator-kernel`
+      // file when it looks for files ending in `kernel`. b/461569369#comment2
+      if (!absl::EndsWith(file, "kernel")) {
+        CF_EXPECT(fetch_build_context_.AddFileToConfig(file));
+      }
     }
   }
   return {};

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,11 @@ Result<void> FetchArtifact::ExtractAll(const std::string& local_path) {`
`136`	`136`
`137`	`137`	`fetch_build_context_.DesparseFiles(extracted);`
`138`	`138`	`for (const std::string& file : extracted) {`
`139`		`- CF_EXPECT(fetch_build_context_.AddFileToConfig(file));`
	`139`	+ // Hack: avoid assemble_cvd incorrect match against `ti50-emulator-kernel`
	`140`	+ // file when it looks for files ending in `kernel`. b/461569369#comment2
	`141`	`+ if (!absl::EndsWith(file, "kernel")) {`
	`142`	`+ CF_EXPECT(fetch_build_context_.AddFileToConfig(file));`
	`143`	`+ }`
`140`	`144`	`}`
`141`	`145`	`}`
`142`	`146`	`return {};`