pw_bluetooth_sapphire: Specify bt-host.cm moniker

This will help the `pkg.$arch.component` workflow replace the old bt-host component. Change-Id: I977b8ba9bd6353fb92c34e903563edcdc60f4a3f Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/237712 Commit-Queue: Darren Chan <[email protected]> Reviewed-by: Ben Lawson <[email protected]> Presubmit-Verified: CQ Bot Account <[email protected]> Lint: Lint 🤖 <[email protected]>
google · Sep 25, 2024 · 24baa12 · 24baa12
1 parent 783b29c
commit 24baa12
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -59,7 +59,7 @@ load("@fuchsia_infra//:workspace.bzl", "fuchsia_infra_workspace")
 
 fuchsia_infra_workspace()
 
-FUCHSIA_SDK_VERSION = "version:24.20240923.3.1"
+FUCHSIA_SDK_VERSION = "version:24.20240924.6.1"
 
 cipd_repository(
     name = "fuchsia_sdk",

diff --git a/pw_bluetooth_sapphire/docs.rst b/pw_bluetooth_sapphire/docs.rst
@@ -91,9 +91,9 @@ code (for example, for FIDL server files).
 ---------------
 Fuchsia support
 ---------------
-``//pw_bluetooth_sapphire/fuchsia`` currently contains a stub bt-host to
-demonstrate building, running, and testing Fuchsia components and packages with
-the Fuchsia SDK.
+``//pw_bluetooth_sapphire/fuchsia`` currently contains the fuchsia-
+build targets for building, running, and testing the ``bt-host`` and
+``bt-hci-virtual`` packages.
 
 .. note::
    Please do not add any fuchsia-specific dependencies (targets that load from
@@ -105,9 +105,6 @@ the Fuchsia SDK.
    dependency needs to specify ``@fuchsia_sdk`` backends for pigweed and the
    target platform is fuchsia.
 
-It will eventually be filled with the real `bt-host component`_ once that's
-migrated. See https://fxbug.dev/321267390.
-
 Build the package
 =================
 To build the bt-host package, use one of the following commands:
@@ -216,7 +213,8 @@ These presubmits can be also be replicated locally with the following command:
 Uploading to CIPD
 =================
 Pigweed infrastructure uploads bt-host's artifacts to
-`fuchsia/prebuilt/bt-host`_ by building bt-host's top level infra target:
+`fuchsia/prebuilt/bt-host`_ and `fuchsia/prebuilt/bt-hci-virtual`_ via the
+`pigweed-linux-bazel-bthost`_ builder by building the top level infra target:
 
 .. code-block::
 
@@ -242,6 +240,7 @@ Roadmap
 * Add configuration options (LE only, Classic only, etc.)
 * Add CLI for controlling stack over RPC
 
-.. _bt-host component: https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/src/connectivity/bluetooth/core/bt-host/
 .. _fuchsia/prebuilt/bt-host: https://chrome-infra-packages.appspot.com/p/fuchsia/prebuilt/bt-host
+.. _fuchsia/prebuilt/bt-hci-virtual: https://chrome-infra-packages.appspot.com/p/fuchsia/prebuilt/bt-hci-virtual
+.. _pigweed-linux-bazel-bthost: https://ci.chromium.org/ui/p/pigweed/builders/pigweed.ci/pigweed-linux-bazel-bthost
 .. _GN presubmit step: https://cs.opensource.google/pigweed/pigweed/+/main:pw_presubmit/py/pw_presubmit/pigweed_presubmit.py?q=gn_chre_googletest_nanopb_sapphire_build
diff --git a/pw_bluetooth_sapphire/fuchsia/bt_host/BUILD.bazel b/pw_bluetooth_sapphire/fuchsia/bt_host/BUILD.bazel
@@ -120,6 +120,7 @@ fuchsia_component(
     name = "component",
     component_name = "bt-host",
     manifest = ":manifest",
+    moniker = "core/bluetooth-core/bt-host-collection:bt-host_000",
     deps = [":bt_host_bin"],
 )