[build] Fix archive-images-manifest in Bazel assembly
Removes dependency on GN assembly when Bazel assembly is enabled.
Change-Id: I041f1f41a7bc14b32afd63fdc7cfe7c23fd22a26
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/865258
Reviewed-by: Jiaming Li <lijiaming@google.com>
Commit-Queue: Jay Zhuang <jayzhuang@google.com>
diff --git a/build/bazel/assembly/bazel_product_bundle.gni b/build/bazel/assembly/bazel_product_bundle.gni
index 3e6da63..c0b6773 100644
--- a/build/bazel/assembly/bazel_product_bundle.gni
+++ b/build/bazel/assembly/bazel_product_bundle.gni
@@ -4,6 +4,7 @@
import("//build/bazel/bazel_action.gni")
import("//build/images/args.gni")
+import("//build/images/supports_fastboot_fvm.gni")
import("//build/images/vbmeta.gni")
import("//build/info/info.gni")
import("//build/sdk/product_bundle_transfer_manifest.gni")
@@ -310,6 +311,21 @@
},
]
+ if (supports_fastboot_fvm) {
+ images += [
+ {
+ name = "fvm.fastboot"
+ cpu = current_cpu
+ type = "blk"
+ label = _full_label
+ path = "${_system_a_root}/fvm.fastboot.blk"
+
+ archive = true
+ fastboot_flash = [ fvm_partition ]
+ },
+ ]
+ }
+
if (use_vbmeta) {
images += [
{
diff --git a/build/images/flash/BUILD.gn b/build/images/flash/BUILD.gn
index 71d76df..ede1aa1 100644
--- a/build/images/flash/BUILD.gn
+++ b/build/images/flash/BUILD.gn
@@ -407,7 +407,7 @@
}
if (supports_fastboot_fvm) {
- archive_deps += [ "//build/images/fuchsia" ]
+ archive_deps += [ labels.images ]
archive_args += [
"--fvm-image=" + get_path_info(files.fvm_fastboot, "file"),
"--fvm=${fvm_partition}",
diff --git a/build/images/paths.gni b/build/images/paths.gni
index b629691..1c5922d 100644
--- a/build/images/paths.gni
+++ b/build/images/paths.gni
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/images/args.gni")
+import("//build/images/supports_fastboot_fvm.gni")
import("//build/product.gni")
import("//src/storage/fshost/generated_fshost_config.gni")
import("//zircon/kernel/phys/qemu.gni")
@@ -58,8 +59,6 @@
qemu_kernel = _qemu_deps[0]
}
-supports_fastboot_fvm =
- !fxfs_blob && fvm_partition != "" && !use_bringup_assembly
supports_flashing_fxfs =
fxfs_blob && fxfs_partition != "" && !use_bringup_assembly
diff --git a/build/images/supports_fastboot_fvm.gni b/build/images/supports_fastboot_fvm.gni
new file mode 100644
index 0000000..4f4c0db
--- /dev/null
+++ b/build/images/supports_fastboot_fvm.gni
@@ -0,0 +1,10 @@
+# Copyright 2023 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/images/args.gni")
+import("//build/product.gni")
+import("//src/storage/fshost/generated_fshost_config.gni")
+
+supports_fastboot_fvm =
+ !fxfs_blob && fvm_partition != "" && !use_bringup_assembly
