commit 7c811d262abd6c2d9917165352edabc0c65908da
author Cody Schuffelen <schuffelen@google.com> Mon Oct 07 17:37:15 2019 -0700
committer Cody Schuffelen <schuffelen@google.com> Tue Oct 08 12:43:25 2019 -0700
tree 589fd40884ea93bef9614795e64369ec0d35a354
parent 3ce5c99f6ff5ff38d3060d71e48f1ca9c0c7172f

Support img.zip files without system images.

Mixed system image builds will now always download the target files zip
in addition to the image zip, which has more than enough files to
support remixing the super image.

This is a simple solution to the problem but adds a nontrivial download
cost, so there is a lot of room for optimization here.

Bug: 141721921
Test: fetch_cvd -default_build=5925895 -system_build=5926038
Change-Id: I573b40483ba7730e89c4062366e761399666728d

host/commands/fetcher/fetch_cvd.cc

diff --git a/host/commands/fetcher/fetch_cvd.cc b/host/commands/fetcher/fetch_cvd.cc
index 2683247..5e314c8 100644
--- a/host/commands/fetcher/fetch_cvd.cc
+++ b/host/commands/fetcher/fetch_cvd.cc
@@ -101,7 +101,7 @@
 
   std::vector<std::string> files = ExtractImages(local_path, target_directory, images);
   if (files.empty()) {
-    LOG(FATAL) << "Could not extract " << local_path;
+    LOG(ERROR) << "Could not extract " << local_path;
     return {};
   }
   if (unlink(local_path.c_str()) != 0) {
@@ -312,7 +312,7 @@
       desparse(target_dir + "/userdata.img");
       AddFilesToConfig(cvd::FileSource::DEFAULT_BUILD, default_build, image_files, &config);
     }
-    if (FLAGS_download_target_files_zip) {
+    if (FLAGS_system_build != "" || FLAGS_download_target_files_zip) {
       std::vector<std::string> target_files =
           download_target_files(&build_api, default_build, target_dir);
       if (target_files.empty()) {
@@ -329,18 +329,20 @@
         std::vector<std::string> image_files =
             download_images(&build_api, system_build, target_dir, {"system.img"});
         if (image_files.empty()) {
-          LOG(FATAL) << "Could not download system image for " << system_build;
+          LOG(INFO) << "Could not find system image for " << system_build
+                    << "in the img zip. Assuming a super image build, which will "
+                    << "get the super image from the target zip.";
+        } else {
+          AddFilesToConfig(cvd::FileSource::SYSTEM_BUILD, system_build, image_files,
+                           &config, true);
         }
-        AddFilesToConfig(cvd::FileSource::SYSTEM_BUILD, system_build, image_files, &config, true);
       }
-      if (FLAGS_download_target_files_zip) {
-        std::vector<std::string> target_files =
-            download_target_files(&build_api, system_build, target_dir);
-        if (target_files.empty()) {
-          LOG(FATAL) << "Could not download target files for " << system_build;
-        }
-        AddFilesToConfig(cvd::FileSource::SYSTEM_BUILD, system_build, target_files, &config);
+      std::vector<std::string> target_files =
+          download_target_files(&build_api, system_build, target_dir);
+      if (target_files.empty()) {
+        LOG(FATAL) << "Could not download target files for " << system_build;
       }
+      AddFilesToConfig(cvd::FileSource::SYSTEM_BUILD, system_build, target_files, &config);
     }
 
     if (FLAGS_kernel_build != "") {