[fuchsia.bluetooth.host] Move to //sdk/fidl
All (non-test) FIDL definitions should be in //sdk/fidl.
Test: Compiles.
Change-Id: I5d589db8c84c5d72ad19a8dff5f243e27cb3ef92
diff --git a/garnet/bin/bluetooth/README.md b/garnet/bin/bluetooth/README.md
index 1a76131..cae186a 100644
--- a/garnet/bin/bluetooth/README.md
+++ b/garnet/bin/bluetooth/README.md
@@ -12,7 +12,7 @@
* [Control](../../public/fidl/fuchsia.bluetooth.control)
* [GATT](../../public/fidl/fuchsia.bluetooth.gatt)
* [LE](../../public/fidl/fuchsia.bluetooth.le)
-- [Private API](../../lib/bluetooth/fidl)
+- [Private API](/sdk/fidl/fuchsia.bluetooth.host)
- [Tools](tools/)
- [Host Library](../../drivers/bluetooth/lib)
- [Host Bus Driver](../../drivers/bluetooth/host)
diff --git a/garnet/bin/bluetooth/bt-gap/BUILD.gn b/garnet/bin/bluetooth/bt-gap/BUILD.gn
index e5e005e..33271d3 100644
--- a/garnet/bin/bluetooth/bt-gap/BUILD.gn
+++ b/garnet/bin/bluetooth/bt-gap/BUILD.gn
@@ -12,12 +12,12 @@
with_unit_tests = true
deps = [
- "//garnet/lib/bluetooth/fidl:fuchsia.bluetooth.host-rustc",
"//garnet/lib/rust/fuchsia-bluetooth",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.bredr:fuchsia.bluetooth.bredr-rustc",
"//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
"//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host-rustc",
"//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
"//garnet/public/lib/fidl/rust/fidl",
diff --git a/garnet/bin/bluetooth/bt-gap/README.md b/garnet/bin/bluetooth/bt-gap/README.md
index 091a124..66607ee 100644
--- a/garnet/bin/bluetooth/bt-gap/README.md
+++ b/garnet/bin/bluetooth/bt-gap/README.md
@@ -4,7 +4,7 @@
- [HostDevice](host_device.rs):
- Receives FIDL events from `bt-host`, and relays them to mods via
HostDispatcher.
- - Provides thin wrappers over some of the [private Bluetooth API](../../../lib/bluetooth/fidl), for use by HostDispatcher.
+ - Provides thin wrappers over some of the [private Bluetooth API](/sdk/fidl/fuchsia.bluetooth.host), for use by HostDispatcher.
- [ControlService](control_service.rs): Implements the `fuchsia.bluetooth.control.Control`
interface, calling into HostDispatcher for help.
- [HostDispatcher](host_dispatcher.rs):
diff --git a/garnet/bin/bluetooth/bt-mgr/BUILD.gn b/garnet/bin/bluetooth/bt-mgr/BUILD.gn
index fd7b761..fbaab37 100644
--- a/garnet/bin/bluetooth/bt-mgr/BUILD.gn
+++ b/garnet/bin/bluetooth/bt-mgr/BUILD.gn
@@ -10,12 +10,12 @@
edition = "2018"
deps = [
- "//garnet/lib/bluetooth/fidl:fuchsia.bluetooth.host-rustc",
"//garnet/lib/rust/fuchsia-bluetooth",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.bredr:fuchsia.bluetooth.bredr-rustc",
"//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
"//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host-rustc",
"//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//sdk/fidl/fuchsia.bluetooth.snoop:fuchsia.bluetooth.snoop-rustc",
"//garnet/public/lib/fidl/rust/fidl",
diff --git a/garnet/bin/bluetooth/tests/integration/BUILD.gn b/garnet/bin/bluetooth/tests/integration/BUILD.gn
index b35a826..3509d52 100644
--- a/garnet/bin/bluetooth/tests/integration/BUILD.gn
+++ b/garnet/bin/bluetooth/tests/integration/BUILD.gn
@@ -14,13 +14,13 @@
rustc_binary("host_lifecycle") {
edition = "2015"
deps = [
- "//garnet/lib/bluetooth/fidl:fuchsia.bluetooth.host-rustc",
"//garnet/lib/rust/fuchsia-bluetooth",
- "//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
- "//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
- "//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//garnet/public/rust/fdio",
"//garnet/public/rust/fuchsia-async",
+ "//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//third_party/rust-crates/rustc_deps:failure",
"//third_party/rust-crates/rustc_deps:futures-preview",
"//third_party/rust-crates/rustc_deps:parking_lot",
@@ -34,16 +34,16 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/lib/bluetooth/fidl:fuchsia.bluetooth.host-rustc",
"//garnet/lib/rust/fuchsia-bluetooth",
- "//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
- "//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
- "//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
- "//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//garnet/public/rust/fdio",
"//garnet/public/rust/fuchsia-async",
"//garnet/public/rust/fuchsia-vfs/fuchsia-vfs-watcher",
"//garnet/public/rust/fuchsia-zircon",
+ "//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//third_party/rust-crates/rustc_deps:failure",
"//third_party/rust-crates/rustc_deps:futures-preview",
"//third_party/rust-crates/rustc_deps:parking_lot",
diff --git a/garnet/docs/bluetooth_architecture.md b/garnet/docs/bluetooth_architecture.md
index 21b6550..f05355d 100644
--- a/garnet/docs/bluetooth_architecture.md
+++ b/garnet/docs/bluetooth_architecture.md
@@ -77,7 +77,7 @@
[control.fidl](../public/fidl/fuchsia.bluetooth.control.fidl) provides a management
interface to designate an active adapter when multiple adapters are present.
-bt-host devices implement the [host.fidl](../lib/bluetooth/fidl/host.fidl)
+bt-host devices implement the [host.fidl](/sdk/fidl/fuchsia.bluetooth.host/host.fidl)
management interface to communicate with the Bluetooth system service (accessed
via [ioctl](../lib/bluetooth/fidl/c/bt_host.h).
diff --git a/garnet/drivers/bluetooth/host/BUILD.gn b/garnet/drivers/bluetooth/host/BUILD.gn
index 1b0bb6b..f28f39b 100644
--- a/garnet/drivers/bluetooth/host/BUILD.gn
+++ b/garnet/drivers/bluetooth/host/BUILD.gn
@@ -52,12 +52,12 @@
deps = [
"//garnet/drivers/bluetooth/lib",
"//garnet/lib/bluetooth/c",
- "//garnet/lib/bluetooth/fidl:fuchsia.bluetooth.host",
- "//sdk/fidl/fuchsia.bluetooth",
+ "//garnet/public/lib/fxl",
"//sdk/fidl/fuchsia.bluetooth.control",
"//sdk/fidl/fuchsia.bluetooth.gatt",
+ "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host",
"//sdk/fidl/fuchsia.bluetooth.le",
- "//garnet/public/lib/fxl",
+ "//sdk/fidl/fuchsia.bluetooth",
"//zircon/public/banjo/ddk-protocol-bt-gattsvc",
"//zircon/public/lib/ddk",
"//zircon/public/lib/driver",
diff --git a/garnet/lib/bluetooth/c/bt_host.h b/garnet/lib/bluetooth/c/bt_host.h
index 28c54e5..2ba89b8 100644
--- a/garnet/lib/bluetooth/c/bt_host.h
+++ b/garnet/lib/bluetooth/c/bt_host.h
@@ -10,7 +10,7 @@
__BEGIN_CDECLS
// This ioctl can be used on a bt-host device to open a Host FIDL
-// interface channel (see garnet/lib/bluetooth/fidl/host.fidl).
+// interface channel (see //sdk/fidl/fuchsia.bluetooth.host/host.fidl).
#define IOCTL_BT_HOST_OPEN_CHANNEL \
IOCTL(IOCTL_KIND_GET_HANDLE, IOCTL_FAMILY_BT_HOST, 0)
diff --git a/garnet/lib/rust/fuchsia-bluetooth/BUILD.gn b/garnet/lib/rust/fuchsia-bluetooth/BUILD.gn
index 9c9ac72..f75e921 100644
--- a/garnet/lib/rust/fuchsia-bluetooth/BUILD.gn
+++ b/garnet/lib/rust/fuchsia-bluetooth/BUILD.gn
@@ -13,11 +13,11 @@
with_unit_tests = true
deps = [
- "//garnet/lib/bluetooth/fidl:fuchsia.bluetooth.host-rustc",
- "//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
- "//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
"//garnet/public/rust/fdio",
"//garnet/public/rust/fuchsia-zircon",
+ "//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
+ "//sdk/fidl/fuchsia.bluetooth.host:fuchsia.bluetooth.host-rustc",
"//third_party/rust-crates/rustc_deps:failure",
"//third_party/rust-crates/rustc_deps:lazy_static",
"//third_party/rust-crates/rustc_deps:rand",
diff --git a/garnet/lib/bluetooth/fidl/BUILD.gn b/sdk/fidl/fuchsia.bluetooth.host/BUILD.gn
similarity index 89%
rename from garnet/lib/bluetooth/fidl/BUILD.gn
rename to sdk/fidl/fuchsia.bluetooth.host/BUILD.gn
index ce25946..de698cc 100644
--- a/garnet/lib/bluetooth/fidl/BUILD.gn
+++ b/sdk/fidl/fuchsia.bluetooth.host/BUILD.gn
@@ -5,10 +5,15 @@
import("//build/fidl/fidl.gni")
fidl("fuchsia.bluetooth.host") {
+ # Internal-only
+ #
+ # Do not add to partner SDK.
+
sources = [
"bonding.fidl",
"host.fidl",
]
+
public_deps = [
"//sdk/fidl/fuchsia.bluetooth",
"//sdk/fidl/fuchsia.bluetooth.bredr",
diff --git a/garnet/lib/bluetooth/fidl/bonding.fidl b/sdk/fidl/fuchsia.bluetooth.host/bonding.fidl
similarity index 100%
rename from garnet/lib/bluetooth/fidl/bonding.fidl
rename to sdk/fidl/fuchsia.bluetooth.host/bonding.fidl
diff --git a/garnet/lib/bluetooth/fidl/host.fidl b/sdk/fidl/fuchsia.bluetooth.host/host.fidl
similarity index 100%
rename from garnet/lib/bluetooth/fidl/host.fidl
rename to sdk/fidl/fuchsia.bluetooth.host/host.fidl
