[boards] Switch to board_package_labels
The boards were still using old-style JSON paths rather than GN labels.
This CL brings them closer to the future.
Change-Id: I7348d1b19e0eccf56fec4ef83625ff7d6938afd7
diff --git a/BUILD.gn b/BUILD.gn
index 52aedd4..e395dad 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -29,6 +29,10 @@
# the base and cache package sets, which means you do not need to redundantly
# include those labels in this variable.
universe_package_labels = []
+
+ # A list of package labels to include in the 'base' package set. Used by the
+ # board definition rather than the product definition.
+ board_package_labels = []
}
# Write a file that can be sourced by `fx`. This file is produced
@@ -61,10 +65,14 @@
"//build/images:packages",
"//sdk:core",
]
- if (preinstall_package_labels != [] || monolith_package_labels != []) {
+ if (preinstall_package_labels != []
+ || monolith_package_labels != []
+ || base_package_labels != []
+ || cache_package_labels != []) {
deps += [ "//build/images" ]
}
- if (available_package_labels != []) {
+ if (available_package_labels != []
+ || universe_package_labels != []) {
deps += [ "//build/images:updates" ]
}
}
@@ -183,7 +191,7 @@
group("additional_base_packages") {
testonly = true
visibility = [ "//build/images:monolith_packages" ]
- public_deps = base_package_labels
+ public_deps = base_package_labels + board_package_labels
}
group("additional_cache_packages") {
diff --git a/boards/arm64.gni b/boards/arm64.gni
index f75c026..0cf4311 100644
--- a/boards/arm64.gni
+++ b/boards/arm64.gni
@@ -4,8 +4,10 @@
target_cpu = "arm64"
-board_packages = [
+board_packages = []
+
+board_package_labels = [
# Include all drivers for now.
- "garnet/packages/prod/drivers",
- "garnet/packages/prod/sysmem-assistant",
+ "//garnet/packages/prod:drivers",
+ "//garnet/packages/prod:sysmem-assistant",
]
diff --git a/boards/chromebook-x64.gni b/boards/chromebook-x64.gni
index b6b706c..0605065 100644
--- a/boards/chromebook-x64.gni
+++ b/boards/chromebook-x64.gni
@@ -6,11 +6,13 @@
board_name = "chromebook-x64"
+board_packages = []
+
update_kernels = [ "zbi.signed" ]
use_vboot = true
-board_packages = [
+board_package_labels = [
# Include all drivers for now.
- "garnet/packages/prod/drivers",
+ "//garnet/packages/prod:drivers",
]
diff --git a/boards/toulouse.gni b/boards/toulouse.gni
index 9d3b31e..97a6845 100644
--- a/boards/toulouse.gni
+++ b/boards/toulouse.gni
@@ -4,9 +4,11 @@
target_cpu = "x64"
-board_packages = [
+board_packages = []
+
+board_package_labels = [
# Include all drivers for now.
- "garnet/packages/prod/drivers",
+ "//garnet/packages/prod:drivers",
]
# Fuchsia does not have a deterministic ordering for bringing up PCI devices, so the
diff --git a/boards/vim2.gni b/boards/vim2.gni
index 143e770..456117a 100644
--- a/boards/vim2.gni
+++ b/boards/vim2.gni
@@ -6,7 +6,7 @@
board_name = "vim2"
-board_packages += [ "garnet/packages/config/vim2_media_config" ]
+board_package_labels += [ "//garnet/packages/config:vim2_media_config" ]
# partitions for fx flash to flash
zircon_a_partition = "boot"
diff --git a/boards/x64.gni b/boards/x64.gni
index 71600a9..7a21bcc 100644
--- a/boards/x64.gni
+++ b/boards/x64.gni
@@ -6,9 +6,11 @@
board_name = "pc"
+board_packages = []
+
export_x64_sdk_images = true
-board_packages = [
+board_package_labels = [
# Include all drivers for now.
- "garnet/packages/prod/drivers",
+ "//garnet/packages/prod:drivers",
]
