Relax rules to match the target_files zip.
Local target zip files have the suffix "eng.username.zip", so this
relaxes the rules matching the zip files so they could possibly have any
final suffix.
Bug: 140524056
Test: fetch_cvd on a local image
Change-Id: I8111e11ff0b4e294aed0d83c686b7f70dcfe3d4c
diff --git a/host/commands/assemble_cvd/super_image_mixer.cc b/host/commands/assemble_cvd/super_image_mixer.cc
index 1960d41..9544670 100644
--- a/host/commands/assemble_cvd/super_image_mixer.cc
+++ b/host/commands/assemble_cvd/super_image_mixer.cc
@@ -44,8 +44,8 @@
if (file_info.source != source) {
continue;
}
- std::string expected_filename = "target_files-" + file_iter.second.build_id + ".zip";
- if (!android::base::EndsWith(file_path, expected_filename)) {
+ std::string expected_filename = "target_files-" + file_iter.second.build_id;
+ if (file_path.find(expected_filename) != std::string::npos) {
continue;
}
return file_path;;
