commit 2fcab1cb445e1b57903ec7467a6d30e88587df8c
author Aaron Wood <aaronwood@fuchsia.infra.roller.google.com> Sat Nov 23 01:04:24 2024 +0000
committer Copybara-Service <copybara-worker@google.com> Fri Nov 22 17:06:16 2024 -0800
tree f6a47f8e5eb75aff690fc07f5e583b150a4f4b08
parent 0e371a2ae1d83a0068082afa1240dd342758bbec

[roll] Roll fuchsia [make-fuchsia-vol] Correct behavior so --zbi is used preferentially vs. the product bundle.

fxr/1161078 accidentally made the product bundle take precendence
over the --zbi arg when creating a/b/r images.  This corrects that
bug and applies the value from --zbi before falling back to the
product bundle.

Original-Bug: b/380130504
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1162372
Original-Revision: c74d8dc8d9e351677e640191273404cb2bf9c275
GitOrigin-RevId: 073b17a35d6b8a6254ac9f3ce5f103d7e329541f
Change-Id: I6b26fe4619c092144b3b760c7506ad74395872e8

stem

diff --git a/stem b/stem
index 23e4e72..5514257 100644
--- a/stem
+++ b/stem
@@ -11,7 +11,7 @@
              githooks="integration/git-hooks"
              remote="https://fuchsia.googlesource.com/fuchsia"
              gerrithost="https://fuchsia-review.googlesource.com"
-             revision="a8379657b3cbabffa436b672f05db257d6b6cf79"/>
+             revision="c74d8dc8d9e351677e640191273404cb2bf9c275"/>
   </projects>
   <hooks>
     <hook name="install-environment"