commit 0bfe5968d1fb6b02f8ed06edeb775c6386017263
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 17 02:26:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 17 02:26:10 2021 +0000
tree adf73ef328c9f9b7d3c3434f9fe9d6de7e56535c
parent 9a6e340e091f0d972afa97aca77e77f286de5780
parent 6284d326b4f5eee22b2fe07e3c4740187e62f232

Merge "Keystore 2.0: Temporarily disable software keymint."

host/commands/fetcher/fetch_cvd.cc

diff --git a/host/commands/fetcher/fetch_cvd.cc b/host/commands/fetcher/fetch_cvd.cc
index 0f7fe00..b84fbba 100644
--- a/host/commands/fetcher/fetch_cvd.cc
+++ b/host/commands/fetcher/fetch_cvd.cc
@@ -424,6 +424,12 @@
       if (build_api.ArtifactToFile(kernel_build, "bzImage", local_path)) {
         AddFilesToConfig(FileSource::KERNEL_BUILD, kernel_build, {local_path},
                          &config, target_dir);
+      }
+      // If the kernel is from an arm/aarch64 build, the artifact will be called
+      // Image.
+      else if (build_api.ArtifactToFile(kernel_build, "Image", local_path)) {
+        AddFilesToConfig(FileSource::KERNEL_BUILD, kernel_build, {local_path},
+                         &config, target_dir);
       } else {
         LOG(FATAL) << "Could not download " << kernel_build << ":bzImage to "
             << local_path;
@@ -454,6 +460,13 @@
       if (build_api.ArtifactToFile(bootloader_build, "u-boot.rom", local_path)) {
         AddFilesToConfig(FileSource::BOOTLOADER_BUILD, bootloader_build,
                          {local_path}, &config, target_dir, true);
+      }
+      // If the bootloader is from an arm/aarch64 build, the artifact will be of
+      // filetype bin.
+      else if (build_api.ArtifactToFile(bootloader_build, "u-boot.bin",
+                                        local_path)) {
+        AddFilesToConfig(FileSource::BOOTLOADER_BUILD, bootloader_build,
+                         {local_path}, &config, target_dir, true);
       } else {
         LOG(FATAL) << "Could not download " << bootloader_build << ":u-boot.rom to "
             << local_path;