update to use rules_fuchsia
Change-Id: I32cce329198846eaaff9b96724ef6ee6276b4b89
Reviewed-on: https://fuchsia-review.googlesource.com/c/drivers/graphics/gpu/+/1172060
Fuchsia-Auto-Submit: Chase Latta <chaselatta@google.com>
Reviewed-by: Darren Chan <chandarren@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Jiaming Li <lijiaming@google.com>
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index edb237d..b357c00 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -30,7 +30,7 @@
load("@platforms//host:extension.bzl", "host_platform_repo")
host_platform_repo(
- name = "host_platforms",
+ name = "host_platform",
)
local_repository(
@@ -74,8 +74,16 @@
ensure_file = "//manifests:bazel_sdk.ensure",
)
+cipd_repository(
+ name = "rules_fuchsia",
+ cipd_bin = "@cipd_tool//:cipd",
+ ensure_file = "//manifests:rules_fuchsia.ensure",
+)
+
+load("@rules_fuchsia//fuchsia:defs.bzl", "register_fuchsia_sdk_toolchain")
+
# The fuchsia toolchain contains tools like ffx and fidlc.
-register_toolchains("@fuchsia_sdk//:fuchsia_toolchain_sdk")
+register_fuchsia_sdk_toolchain()
load(
"@fuchsia_sdk//fuchsia:products.bzl",
diff --git a/manifests/bazel_sdk.ensure b/manifests/bazel_sdk.ensure
index 34f0ea2..4e787a2 100644
--- a/manifests/bazel_sdk.ensure
+++ b/manifests/bazel_sdk.ensure
@@ -1,3 +1,3 @@
$ResolvedVersions bazel_sdk.resolved
$VerifiedPlatform linux-amd64 mac-amd64
-fuchsia/sdk/core/fuchsia-bazel-rules/${os=linux}-${arch} version:26.20241205.5.1
+fuchsia/sdk/core/fuchsia-bazel-rules/${os=linux}-${arch} version:26.20241210.7.1
diff --git a/manifests/bazel_sdk.resolved b/manifests/bazel_sdk.resolved
index 95add79..630f1f3 100644
--- a/manifests/bazel_sdk.resolved
+++ b/manifests/bazel_sdk.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia/sdk/core/fuchsia-bazel-rules/linux-amd64
- version:26.20241205.5.1
- nTlxXp3nQx7yo2H9pJaFiv8J9X1eW0R9AkDL6Xw5CH4C
+ version:26.20241210.7.1
+ 4-mo9vypTBdMX50WqYQhYQRw9seaQNTh72J_JoBUNOkC
diff --git a/manifests/fuchsia_platform.ensure b/manifests/fuchsia_platform.ensure
index cc936f9..80d9d15 100644
--- a/manifests/fuchsia_platform.ensure
+++ b/manifests/fuchsia_platform.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions fuchsia_platform.resolved
-fuchsia/assembly/platform/arm64 version:26.20241205.5.1
+fuchsia/assembly/platform/arm64 version:26.20241210.7.1
diff --git a/manifests/fuchsia_platform.resolved b/manifests/fuchsia_platform.resolved
index 681c48e..1cda050 100644
--- a/manifests/fuchsia_platform.resolved
+++ b/manifests/fuchsia_platform.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia/assembly/platform/arm64
- version:26.20241205.5.1
- -BvZ6XuROGnn4OviAj1ThZ4wYGUrmhgRvYHB4bPi_SoC
+ version:26.20241210.7.1
+ 0J8jbMugoNwk4TcEioIPPhyu_swIWdvrQYh9R4smC6IC
diff --git a/manifests/nelson_board.ensure b/manifests/nelson_board.ensure
index 89fa4f8..c750e0c 100644
--- a/manifests/nelson_board.ensure
+++ b/manifests/nelson_board.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions nelson_board.resolved
-fuchsia_internal/assembly/boards/nelson version:26.20241205.5.1
+fuchsia_internal/assembly/boards/nelson version:26.20241210.7.1
diff --git a/manifests/nelson_board.resolved b/manifests/nelson_board.resolved
index 4a91648..fe52219 100644
--- a/manifests/nelson_board.resolved
+++ b/manifests/nelson_board.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia_internal/assembly/boards/nelson
- version:26.20241205.5.1
- gS81RoITCpt0lE25G3Ir1xnLOg2VoPK5kKW6X-XmkQYC
+ version:26.20241210.7.1
+ 3sljZEkLiAr4xkIlzKPeh_GTvDtagMzetbEX9kTPirUC
diff --git a/manifests/nelson_legacy_bundles.ensure b/manifests/nelson_legacy_bundles.ensure
index e8d4359..6101bb0 100644
--- a/manifests/nelson_legacy_bundles.ensure
+++ b/manifests/nelson_legacy_bundles.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions nelson_legacy_bundles.resolved
-fuchsia_internal/assembly/inputs/minimal.nelson version:26.20241205.5.1
+fuchsia_internal/assembly/inputs/minimal.nelson version:26.20241210.7.1
diff --git a/manifests/nelson_legacy_bundles.resolved b/manifests/nelson_legacy_bundles.resolved
index 1d9fb75..47c5a88 100644
--- a/manifests/nelson_legacy_bundles.resolved
+++ b/manifests/nelson_legacy_bundles.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia_internal/assembly/inputs/minimal.nelson
- version:26.20241205.5.1
+ version:26.20241210.7.1
Rrnl__gPm3oNYiwZ04eD4fOFyhRUOOJfIq5zHCffiVoC
diff --git a/manifests/nelson_partitions.ensure b/manifests/nelson_partitions.ensure
index 1026d18..d67437d 100644
--- a/manifests/nelson_partitions.ensure
+++ b/manifests/nelson_partitions.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions nelson_partitions.resolved
-fuchsia_internal/assembly/partitions/nelson version:26.20241205.5.1
+fuchsia_internal/assembly/partitions/nelson version:26.20241210.7.1
diff --git a/manifests/nelson_partitions.resolved b/manifests/nelson_partitions.resolved
index 956a1b3..e9b3603 100644
--- a/manifests/nelson_partitions.resolved
+++ b/manifests/nelson_partitions.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia_internal/assembly/partitions/nelson
- version:26.20241205.5.1
+ version:26.20241210.7.1
jBxeLnxhgVmcTrRq3wZrhSrWysVY_5xEr1PTiQYffQsC
diff --git a/manifests/product_bundles.ensure b/manifests/product_bundles.ensure
index b2d37a3..257adcd 100644
--- a/manifests/product_bundles.ensure
+++ b/manifests/product_bundles.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions product_bundles.resolved
-fuchsia/development/product_bundles/v2 version:26.20241205.5.1
+fuchsia/development/product_bundles/v2 version:26.20241210.7.1
diff --git a/manifests/product_bundles.resolved b/manifests/product_bundles.resolved
index a735a16..4a9acd8 100644
--- a/manifests/product_bundles.resolved
+++ b/manifests/product_bundles.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia/development/product_bundles/v2
- version:26.20241205.5.1
- m8T1ew6W--sol4CKzsm2aeARh0iTcsQCOnPm-_W68q8C
+ version:26.20241210.7.1
+ Ir6cNhC0Q8B8YngVTF6bgfXuZn1bZ8a005rxcyt8LSoC
diff --git a/manifests/rules_fuchsia.ensure b/manifests/rules_fuchsia.ensure
new file mode 100644
index 0000000..976161b
--- /dev/null
+++ b/manifests/rules_fuchsia.ensure
@@ -0,0 +1,4 @@
+$ResolvedVersions rules_fuchsia.resolved
+$VerifiedPlatform linux-amd64
+fuchsia/development/rules_fuchsia version:26.20241210.7.1
+
diff --git a/manifests/rules_fuchsia.resolved b/manifests/rules_fuchsia.resolved
new file mode 100644
index 0000000..124388c
--- /dev/null
+++ b/manifests/rules_fuchsia.resolved
@@ -0,0 +1,6 @@
+# This file is auto-generated by 'cipd ensure-file-resolve'.
+# Do not modify manually. All changes will be overwritten.
+
+fuchsia/development/rules_fuchsia
+ version:26.20241210.7.1
+ zlhnjP5ZCHHbOiiMxvKNavo3jsG7S1c6k7j7l5DpoEMC
diff --git a/manifests/sherlock_board.ensure b/manifests/sherlock_board.ensure
index ffd3aff..d90c44f 100644
--- a/manifests/sherlock_board.ensure
+++ b/manifests/sherlock_board.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions sherlock_board.resolved
-fuchsia_internal/assembly/boards/sherlock version:26.20241205.5.1
+fuchsia_internal/assembly/boards/sherlock version:26.20241210.7.1
diff --git a/manifests/sherlock_board.resolved b/manifests/sherlock_board.resolved
index 5daba65..286a8c2 100644
--- a/manifests/sherlock_board.resolved
+++ b/manifests/sherlock_board.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia_internal/assembly/boards/sherlock
- version:26.20241205.5.1
- AQd6gspxlJGIvxmmWVIEnCI96p5liyk-tYgEjJ8zJLkC
+ version:26.20241210.7.1
+ Wt6297zRjvBiiBeugbEAKHI6-IewP-Lwf_H9YC4VC0sC
diff --git a/manifests/sherlock_legacy_bundles.ensure b/manifests/sherlock_legacy_bundles.ensure
index e26a7d8..9e8d83f 100644
--- a/manifests/sherlock_legacy_bundles.ensure
+++ b/manifests/sherlock_legacy_bundles.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions sherlock_legacy_bundles.resolved
-fuchsia_internal/assembly/inputs/minimal.sherlock version:26.20241205.5.1
+fuchsia_internal/assembly/inputs/minimal.sherlock version:26.20241210.7.1
diff --git a/manifests/sherlock_partitions.ensure b/manifests/sherlock_partitions.ensure
index adbb1f4..d32a033 100644
--- a/manifests/sherlock_partitions.ensure
+++ b/manifests/sherlock_partitions.ensure
@@ -1,2 +1,2 @@
$ResolvedVersions sherlock_partitions.resolved
-fuchsia_internal/assembly/partitions/sherlock version:26.20241205.5.1
+fuchsia_internal/assembly/partitions/sherlock version:26.20241210.7.1
diff --git a/manifests/sherlock_partitions.resolved b/manifests/sherlock_partitions.resolved
index 17d91dc..a46b4d1 100644
--- a/manifests/sherlock_partitions.resolved
+++ b/manifests/sherlock_partitions.resolved
@@ -2,5 +2,5 @@
# Do not modify manually. All changes will be overwritten.
fuchsia_internal/assembly/partitions/sherlock
- version:26.20241205.5.1
+ version:26.20241210.7.1
2M-Yz0LiaF27u02OJrnJToNVuZYBdALIyLNXtblaaKUC
diff --git a/third_party/fuchsia-infra-bazel-rules b/third_party/fuchsia-infra-bazel-rules
index fff6995..734a879 160000
--- a/third_party/fuchsia-infra-bazel-rules
+++ b/third_party/fuchsia-infra-bazel-rules
@@ -1 +1 @@
-Subproject commit fff69957cbd29d1579ff09a3d76c0fa6fc37cba2
+Subproject commit 734a8793696d6ce56dbd745e7e77df5ff8a75f1c
