[fidl][rust] Move garnet/public/lib/fidl/rust to src/lib/fidl/rust
This CL moves the Rust bindings from garnet/ to src/. It updates all
build rules to reflect the new location, but leaves a modified BUILD.gn
in garnet/public/lib/fidl/rust to avoid breaking vendor/google and
src/experiences. This will be removed once those repos are updated.
Apart from garnet/public/lib/fidl/rust/fidl/BUILD.gn, this change was
generated mechanically by:
cd $FUCHSIA_DIR
git ls-files -z "*.gn" "*.gni" "*.md" tools/fidl/gidl/rust/rust.go \
| xargs -0 sed -i -e 's#garnet/public/lib/fidl/rust#src/lib/fidl/rust#'
mkdir src/lib/fidl
cp garnet/public/lib/fidl/OWNERS src/lib/fidl
mv garnet/public/lib/fidl/rust src/lib/fidl
fx format-code
Test: no behavior change
Change-Id: Ib0e097a1e00732ce35f6f854ddeabf99868d614c
diff --git a/build/rust/fidl_rust_library.gni b/build/rust/fidl_rust_library.gni
index f899195..b7f9c11 100644
--- a/build/rust/fidl_rust_library.gni
+++ b/build/rust/fidl_rust_library.gni
@@ -32,7 +32,7 @@
edition = "2018"
forward_variables_from(invoker, [ "testonly" ])
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zircon/rust:fuchsia-zircon-status",
"//third_party/rust_crates:futures",
]
diff --git a/docs/development/languages/fidl/CONTRIBUTING.md b/docs/development/languages/fidl/CONTRIBUTING.md
index e4bf9cb..8672c88 100644
--- a/docs/development/languages/fidl/CONTRIBUTING.md
+++ b/docs/development/languages/fidl/CONTRIBUTING.md
@@ -30,7 +30,7 @@
C | [//zircon/tools/fidl/lib/c_generator.cc][be-c] | [//zircon/system/ulib/fidl/][rtl-c]
C++ | [//garnet/go/src/fidl/compiler/backend/cpp/][be-cpp] | [//zircon/system/ulib/fidl/][rtl-c] & [//sdk/lib/fidl/cpp/][rtl-cpp]
Go | [//garnet/go/src/fidl/compiler/backend/golang/][be-go] | [//third_party/go/src/syscall/zx/fidl/][rtl-go]
-Rust | [//garnet/go/src/fidl/compiler/backend/rust/][be-rust] | [//garnet/public/lib/fidl/rust/fidl/][rtl-rust]
+Rust | [//garnet/go/src/fidl/compiler/backend/rust/][be-rust] | [//src/lib/fidl/rust/fidl/][rtl-rust]
Dart | [//topaz/bin/fidlgen_dart/][be-dart] | [//topaz//public/dart/fidl/][rtl-dart]<br>[//topaz/bin/fidl_bindings_test/][bindings_test-dart]
JavaScript | [chromium:build/fuchsia/fidlgen_fs][be-js] | [chromium:build/fuchsia/fidlgen_js/runtime][rtl-js]
@@ -418,7 +418,7 @@
| llcpp bindings tests | fx run-test fidl_llcpp_types_test | garnet/go/src/fidl/compiler/llcpp_backend |
| go bindings tests | fx run-test go_fidl_tests | third_party/go/syscall/zx/fidl third_party/go/syscall/zx/fidl/fidl_test |
| dart bindings tests | fx run-test fidl_bindings_test | topaz/public/dart/fidl |
-| rust bindings | fx run-test rust_fidl_tests | garnet/public/lib/fidl/rust/fidl |
+| rust bindings | fx run-test rust_fidl_tests | src/lib/fidl/rust/fidl |
The following requires: fx set bringup.x64 --with-base //garnet/packages/tests:zircon
@@ -572,7 +572,7 @@
[rtl-cpp]: /garnet/public/lib/fidl/llcpp/
[rtl-dart]: https://fuchsia.googlesource.com/topaz/+/master/public/dart/fidl/
[rtl-go]: https://fuchsia.googlesource.com/third_party/go/+/master/src/syscall/zx/fidl/
-[rtl-rust]: /garnet/public/lib/fidl/rust/fidl/
+[rtl-rust]: /src/lib/fidl/rust/fidl/
[rtl-js]: https://chromium.googlesource.com/chromium/src/+/master/build/fuchsia/fidlgen_js/runtime/
[getting_started]: /docs/getting_started.md
[compat_readme]: /garnet/public/lib/fidl/compatibility_test/README.md
diff --git a/docs/development/languages/fidl/intro/README.md b/docs/development/languages/fidl/intro/README.md
index e09d8e0..7017494 100644
--- a/docs/development/languages/fidl/intro/README.md
+++ b/docs/development/languages/fidl/intro/README.md
@@ -142,7 +142,7 @@
- [C and low-level C++ bindings](/zircon/system/ulib/fidl)
- [High-level C++ bindings](/sdk/lib/fidl/cpp)
- [Go bindings](https://fuchsia.googlesource.com/third_party/go/+/master/src/syscall/zx/fidl/)
-- [Rust bindings](/garnet/public/lib/fidl/rust)
+- [Rust bindings](/src/lib/fidl/rust)
## Constituent Parts of Specification
diff --git a/docs/development/languages/new/structure.md b/docs/development/languages/new/structure.md
index 917c950..c02e7dc 100644
--- a/docs/development/languages/new/structure.md
+++ b/docs/development/languages/new/structure.md
@@ -156,7 +156,7 @@
* [C](/zircon/system/ulib/fidl)
* [C++](/sdk/lib/fidl/cpp/)
- * [Rust](/garnet/public/lib/fidl/rust/fidl)
+ * [Rust](/src/lib/fidl/rust/fidl)
* [Dart](https://fuchsia.googlesource.com/topaz/+/master/public/dart/fidl/)
* [Go](https://fuchsia.googlesource.com/third_party/go/+/master/src/syscall/zx/fidl/)
diff --git a/examples/components/routing/echo_server/BUILD.gn b/examples/components/routing/echo_server/BUILD.gn
index d77eb78..2ce8a3c 100644
--- a/examples/components/routing/echo_server/BUILD.gn
+++ b/examples/components/routing/echo_server/BUILD.gn
@@ -8,7 +8,7 @@
edition = "2018"
deps = [
"//examples/components/routing/fidl:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/examples/tennis/BUILD.gn b/examples/tennis/BUILD.gn
index 948f509..9122d78 100644
--- a/examples/tennis/BUILD.gn
+++ b/examples/tennis/BUILD.gn
@@ -39,8 +39,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.game.tennis:fuchsia.game.tennis-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -72,8 +72,8 @@
source_root = "viewer/main.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.game.tennis:fuchsia.game.tennis-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -105,8 +105,8 @@
source_root = "rust5_ai/main.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.game.tennis:fuchsia.game.tennis-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/examples/tennis/bots/example_ai/BUILD.gn b/examples/tennis/bots/example_ai/BUILD.gn
index 7303132..2621dfb 100644
--- a/examples/tennis/bots/example_ai/BUILD.gn
+++ b/examples/tennis/bots/example_ai/BUILD.gn
@@ -31,8 +31,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.game.tennis:fuchsia.game.tennis-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/examples/tennis/bots/manual_player/BUILD.gn b/examples/tennis/bots/manual_player/BUILD.gn
index 5949f9f..fb683df 100644
--- a/examples/tennis/bots/manual_player/BUILD.gn
+++ b/examples/tennis/bots/manual_player/BUILD.gn
@@ -27,8 +27,8 @@
edition = "2018"
source_root = "src/main.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.game.tennis:fuchsia.game.tennis-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/examples/tests/rust/BUILD.gn b/examples/tests/rust/BUILD.gn
index 383cc251..53d4d12 100644
--- a/examples/tests/rust/BUILD.gn
+++ b/examples/tests/rust/BUILD.gn
@@ -10,8 +10,8 @@
deps = [
"//examples/components/routing/fidl:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/bin/battery_manager/BUILD.gn b/garnet/bin/battery_manager/BUILD.gn
index 6c5a42f..5f53639 100644
--- a/garnet/bin/battery_manager/BUILD.gn
+++ b/garnet/bin/battery_manager/BUILD.gn
@@ -15,9 +15,9 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_power_ext",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.power:fuchsia.power-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/garnet/bin/fidl_compatibility_test/BUILD.gn b/garnet/bin/fidl_compatibility_test/BUILD.gn
index d22d46a..14c52b5 100644
--- a/garnet/bin/fidl_compatibility_test/BUILD.gn
+++ b/garnet/bin/fidl_compatibility_test/BUILD.gn
@@ -102,8 +102,8 @@
deps = [
"//garnet/public/lib/fidl/compatibility_test:compatibility_test_service-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/garnet/bin/network-speed-test/BUILD.gn b/garnet/bin/network-speed-test/BUILD.gn
index ec78190..1d22bdd 100644
--- a/garnet/bin/network-speed-test/BUILD.gn
+++ b/garnet/bin/network-speed-test/BUILD.gn
@@ -10,9 +10,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/garnet/bin/power_manager/BUILD.gn b/garnet/bin/power_manager/BUILD.gn
index 367a170..874dbf4 100644
--- a/garnet/bin/power_manager/BUILD.gn
+++ b/garnet/bin/power_manager/BUILD.gn
@@ -13,8 +13,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/garnet/bin/setui/BUILD.gn b/garnet/bin/setui/BUILD.gn
index eff6e7d..b873b46 100644
--- a/garnet/bin/setui/BUILD.gn
+++ b/garnet/bin/setui/BUILD.gn
@@ -25,7 +25,6 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.deprecatedtimezone:fuchsia.deprecatedtimezone-rustc",
"//sdk/fidl/fuchsia.devicesettings:fuchsia.devicesettings-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
@@ -40,6 +39,7 @@
"//sdk/fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
"//sdk/fidl/fuchsia.ui.types:fuchsia.ui.types-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/icu_data/rust/icu_data",
@@ -101,9 +101,9 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.settings:fuchsia.settings-rustc",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/garnet/bin/setui_client/BUILD.gn b/garnet/bin/setui_client/BUILD.gn
index afe0dd3..bb74c1a 100644
--- a/garnet/bin/setui_client/BUILD.gn
+++ b/garnet/bin/setui_client/BUILD.gn
@@ -27,7 +27,6 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.accessibility:fuchsia.accessibility-rustc",
"//sdk/fidl/fuchsia.devicesettings:fuchsia.devicesettings-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
@@ -36,6 +35,7 @@
"//sdk/fidl/fuchsia.setui:fuchsia.setui-rustc",
"//sdk/fidl/fuchsia.ui.types:fuchsia.ui.types-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -77,12 +77,12 @@
edition = "2018"
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.settings:fuchsia.settings-rustc",
"//sdk/fidl/fuchsia.setui:fuchsia.setui-rustc",
"//sdk/fidl/fuchsia.ui.types:fuchsia.ui.types-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/garnet/bin/sl4f/BUILD.gn b/garnet/bin/sl4f/BUILD.gn
index 8994de5..57e6686 100644
--- a/garnet/bin/sl4f/BUILD.gn
+++ b/garnet/bin/sl4f/BUILD.gn
@@ -28,7 +28,6 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avdtp:fuchsia.bluetooth.avdtp-rustc",
@@ -58,6 +57,7 @@
"//src/connectivity/bluetooth/lib/bt-avdtp",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mapped-vmo",
diff --git a/garnet/bin/tee_manager/BUILD.gn b/garnet/bin/tee_manager/BUILD.gn
index 6ffaca0..bdbef29 100644
--- a/garnet/bin/tee_manager/BUILD.gn
+++ b/garnet/bin/tee_manager/BUILD.gn
@@ -31,8 +31,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/garnet/bin/terminal/BUILD.gn b/garnet/bin/terminal/BUILD.gn
index c880539..f08a539 100644
--- a/garnet/bin/terminal/BUILD.gn
+++ b/garnet/bin/terminal/BUILD.gn
@@ -26,7 +26,6 @@
deps = [
"third_party/term-model",
"//garnet/bin/terminal/third_party/term-model",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.images:fuchsia.images-rustc",
"//sdk/fidl/fuchsia.math:fuchsia.math-rustc",
"//sdk/fidl/fuchsia.ui.app:fuchsia.ui.app-rustc",
@@ -36,6 +35,7 @@
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
"//src/lib/cstr",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/shared-buffer",
diff --git a/garnet/bin/thermd/BUILD.gn b/garnet/bin/thermd/BUILD.gn
index 64fbdc3..1fb4a22 100644
--- a/garnet/bin/thermd/BUILD.gn
+++ b/garnet/bin/thermd/BUILD.gn
@@ -39,8 +39,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/bin/vsock_service/BUILD.gn b/garnet/bin/vsock_service/BUILD.gn
index db35767..096f78f 100644
--- a/garnet/bin/vsock_service/BUILD.gn
+++ b/garnet/bin/vsock_service/BUILD.gn
@@ -14,9 +14,9 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.vsock:fuchsia.vsock-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -34,8 +34,8 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.vsock:fuchsia.vsock-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/examples/fidl/echo_client_rust/BUILD.gn b/garnet/examples/fidl/echo_client_rust/BUILD.gn
index c3c5ad4..faba692 100644
--- a/garnet/examples/fidl/echo_client_rust/BUILD.gn
+++ b/garnet/examples/fidl/echo_client_rust/BUILD.gn
@@ -11,8 +11,8 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/examples/fidl/echo_client_rust_synchronous/BUILD.gn b/garnet/examples/fidl/echo_client_rust_synchronous/BUILD.gn
index 1cfc3b9..cd3a983 100644
--- a/garnet/examples/fidl/echo_client_rust_synchronous/BUILD.gn
+++ b/garnet/examples/fidl/echo_client_rust_synchronous/BUILD.gn
@@ -11,7 +11,7 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/examples/fidl/echo_server_rust/BUILD.gn b/garnet/examples/fidl/echo_server_rust/BUILD.gn
index d9d1d0c..e6a8ef4 100644
--- a/garnet/examples/fidl/echo_server_rust/BUILD.gn
+++ b/garnet/examples/fidl/echo_server_rust/BUILD.gn
@@ -11,7 +11,7 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/garnet/examples/http/httpget_rust/BUILD.gn b/garnet/examples/http/httpget_rust/BUILD.gn
index a723dd4..0962c24 100644
--- a/garnet/examples/http/httpget_rust/BUILD.gn
+++ b/garnet/examples/http/httpget_rust/BUILD.gn
@@ -10,8 +10,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/examples/intl/manager/BUILD.gn b/garnet/examples/intl/manager/BUILD.gn
index ae84d79..c2dcbf8 100644
--- a/garnet/examples/intl/manager/BUILD.gn
+++ b/garnet/examples/intl/manager/BUILD.gn
@@ -15,9 +15,9 @@
deps = [
"//garnet/examples/intl/manager/fidl:fuchsia.examples.intl.manager-rustc",
"//garnet/lib/rust/fidl_fuchsia_intl_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/garnet/examples/intl/wisdom/rust/client/BUILD.gn b/garnet/examples/intl/wisdom/rust/client/BUILD.gn
index c995a2d..3b51efa 100644
--- a/garnet/examples/intl/wisdom/rust/client/BUILD.gn
+++ b/garnet/examples/intl/wisdom/rust/client/BUILD.gn
@@ -17,8 +17,8 @@
deps = [
"//garnet/examples/intl/wisdom/fidl:wisdom-rustc",
"//garnet/lib/rust/fidl_fuchsia_intl_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/icu_data/rust/icu_data",
diff --git a/garnet/examples/intl/wisdom/rust/server/BUILD.gn b/garnet/examples/intl/wisdom/rust/server/BUILD.gn
index 061fe26..638e2da 100644
--- a/garnet/examples/intl/wisdom/rust/server/BUILD.gn
+++ b/garnet/examples/intl/wisdom/rust/server/BUILD.gn
@@ -17,8 +17,8 @@
deps = [
"//garnet/examples/intl/wisdom/fidl:wisdom-rustc",
"//garnet/lib/rust/fidl_fuchsia_intl_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/icu_data/rust/icu_data",
diff --git a/garnet/lib/rust/connectivity-testing/BUILD.gn b/garnet/lib/rust/connectivity-testing/BUILD.gn
index bb73759..b890a9e 100644
--- a/garnet/lib/rust/connectivity-testing/BUILD.gn
+++ b/garnet/lib/rust/connectivity-testing/BUILD.gn
@@ -16,12 +16,12 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common-rustc",
"//src/connectivity/lib/net-types",
"//src/connectivity/wlan/lib/common/rust:wlan-common",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/garnet/lib/rust/ethernet/BUILD.gn b/garnet/lib/rust/ethernet/BUILD.gn
index 585c731..a350039 100644
--- a/garnet/lib/rust/ethernet/BUILD.gn
+++ b/garnet/lib/rust/ethernet/BUILD.gn
@@ -13,8 +13,8 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/shared-buffer",
diff --git a/garnet/lib/rust/fidl_fuchsia_fonts_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_fonts_ext/BUILD.gn
index 1b9b828..5f604d8 100644
--- a/garnet/lib/rust/fidl_fuchsia_fonts_ext/BUILD.gn
+++ b/garnet/lib/rust/fidl_fuchsia_fonts_ext/BUILD.gn
@@ -9,8 +9,8 @@
rustc_library("fidl_fuchsia_fonts_ext") {
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.fonts:fuchsia.fonts-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
+ "//src/lib/fidl/rust/fidl",
]
}
diff --git a/garnet/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn b/garnet/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn
index f5576a4..4d9571d 100644
--- a/garnet/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn
+++ b/garnet/lib/rust/fidl_fuchsia_net_stack_ext/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext",
"//garnet/lib/rust/fidl_fuchsia_net_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:bitflags",
"//third_party/rust_crates:thiserror",
diff --git a/garnet/lib/rust/files_async/BUILD.gn b/garnet/lib/rust/files_async/BUILD.gn
index 1289c7f..a986120 100644
--- a/garnet/lib/rust/files_async/BUILD.gn
+++ b/garnet/lib/rust/files_async/BUILD.gn
@@ -10,7 +10,7 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
diff --git a/garnet/lib/rust/io_util/BUILD.gn b/garnet/lib/rust/io_util/BUILD.gn
index 5c8bee1..5ee669d 100644
--- a/garnet/lib/rust/io_util/BUILD.gn
+++ b/garnet/lib/rust/io_util/BUILD.gn
@@ -10,8 +10,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/garnet/lib/rust/netfilter/BUILD.gn b/garnet/lib/rust/netfilter/BUILD.gn
index e40e1fb..37ddf3f 100644
--- a/garnet/lib/rust/netfilter/BUILD.gn
+++ b/garnet/lib/rust/netfilter/BUILD.gn
@@ -11,8 +11,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.filter:fuchsia.net.filter-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:pest",
diff --git a/garnet/packages/tests/BUILD.gn b/garnet/packages/tests/BUILD.gn
index f034ef7..366b2a8 100644
--- a/garnet/packages/tests/BUILD.gn
+++ b/garnet/packages/tests/BUILD.gn
@@ -446,14 +446,14 @@
"//garnet/go/src/fidl:fidlgen_rust_test($host_toolchain)",
"//garnet/go/src/fidl:fidlgen_syzkaller_test($host_toolchain)",
"//garnet/go/src/fidl:fidlgen_types_test($host_toolchain)",
- "//garnet/public/lib/fidl/rust/fidl:fidl_test_build($host_toolchain)",
- "//garnet/public/lib/fidl/rust/fidl:tests",
"//garnet/tests/fidl-changes",
"//garnet/tests/fidl-dangerous-identifiers",
"//sdk/lib/fidl/cpp:fidl_cpp_host_conformance_test($host_toolchain)",
"//sdk/lib/fidl/cpp:fidl_cpp_host_unittests($host_toolchain)",
"//sdk/lib/fidl/cpp:fidl_tests",
"//sdk/lib/sys/service/cpp:sys_service_tests",
+ "//src/lib/fidl/rust/fidl:fidl_test_build($host_toolchain)",
+ "//src/lib/fidl/rust/fidl:tests",
"//tools/fidl/gidl:gidl_golang_test($host_toolchain)",
"//tools/fidl/gidl:gidl_mixer_test($host_toolchain)",
"//tools/fidl/gidl:gidl_parser_test($host_toolchain)",
diff --git a/garnet/public/lib/fidl/rust/fidl/BUILD.gn b/garnet/public/lib/fidl/rust/fidl/BUILD.gn
index 2c5cb47..2381f51 100644
--- a/garnet/public/lib/fidl/rust/fidl/BUILD.gn
+++ b/garnet/public/lib/fidl/rust/fidl/BUILD.gn
@@ -5,11 +5,10 @@
import("//build/fidl/fidl.gni")
import("//build/fidl/wireformat.gni")
import("//build/rust/rustc_library.gni")
-import("//build/test/test_package.gni")
-import("//build/testing/environments.gni")
rustc_library("fidl") {
- with_unit_tests = true
+ source_root = "//src/lib/fidl/rust/fidl/src/lib.rs"
+ with_unit_tests = false
edition = "2018"
deps = [
"//src/lib/zircon/rust:fuchsia-zircon-status",
@@ -33,60 +32,7 @@
"//third_party/rust_crates:slab",
]
}
- test_deps = [
- "//src/lib/test_util",
- "//third_party/rust_crates:futures-test",
- "//third_party/rust_crates:matches",
- ]
if (fidl_write_v1_wireformat) {
features = [ "fidl_write_v1" ]
}
}
-
-# not actually used-- just to ensure successful compilation
-fidl("fidl.rust.test.compilation") {
- sources = [ "compilation.test.fidl" ]
-}
-
-# not actually used-- just to ensure successful compilation
-# tests we can compose protocols from another FIDL crate
-fidl("fidl.rust.test.compilation.compose") {
- sources = [ "compilation_compose.test.fidl" ]
-
- public_deps = [ ":fidl.rust.test.compilation" ]
-}
-
-test_package("rust_fidl_tests") {
- deps = [
- ":fidl.rust.test.compilation-rustc",
- ":fidl.rust.test.compilation-rustc($host_toolchain)",
- ":fidl_test",
- "//garnet/public/lib/fidl/rust/fidl_tests:fidl_conformance_tests",
- "//garnet/public/lib/fidl/rust/fidl_tests:fidl_external_tests",
- ]
- tests = [
- {
- name = "fidl_lib_test"
- dest = "fidl_tests"
- environments = basic_envs
- },
- {
- name = "fidl_external_tests"
- dest = "fidl_external_tests"
- environments = basic_envs
- },
- {
- name = "fidl_conformance_tests"
- dest = "fidl_conformance_tests"
- environments = basic_envs
- },
- ]
-}
-
-group("tests") {
- testonly = true
- public_deps = [
- ":fidl_test($host_toolchain)",
- ":rust_fidl_tests",
- ]
-}
diff --git a/garnet/tests/fidl-changes/rust/BUILD.gn b/garnet/tests/fidl-changes/rust/BUILD.gn
index 538be9b..a3c69e9 100644
--- a/garnet/tests/fidl-changes/rust/BUILD.gn
+++ b/garnet/tests/fidl-changes/rust/BUILD.gn
@@ -9,10 +9,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/tests/fidl-changes:fidl.test.after-rustc",
"//garnet/tests/fidl-changes:fidl.test.before-rustc",
"//garnet/tests/fidl-changes:fidl.test.during-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//third_party/rust_crates:futures",
]
diff --git a/src/cobalt/bin/testing/mock_cobalt/BUILD.gn b/src/cobalt/bin/testing/mock_cobalt/BUILD.gn
index 342c2b5..7d8e767 100644
--- a/src/cobalt/bin/testing/mock_cobalt/BUILD.gn
+++ b/src/cobalt/bin/testing/mock_cobalt/BUILD.gn
@@ -13,9 +13,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.cobalt.test:fuchsia.cobalt.test-rustc",
"//src/lib/cobalt/rust:fuchsia-cobalt",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/bluetooth/core/bt-gap/BUILD.gn b/src/connectivity/bluetooth/core/bt-gap/BUILD.gn
index 116d0f3..df8fd72 100644
--- a/src/connectivity/bluetooth/core/bt-gap/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-gap/BUILD.gn
@@ -14,7 +14,6 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//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",
@@ -25,6 +24,7 @@
"//src/connectivity/bluetooth/fidl:host-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/connectivity/bluetooth/core/bt-init/BUILD.gn b/src/connectivity/bluetooth/core/bt-init/BUILD.gn
index ccc90f8..ac89ec32 100644
--- a/src/connectivity/bluetooth/core/bt-init/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-init/BUILD.gn
@@ -10,7 +10,6 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//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",
@@ -19,6 +18,7 @@
"//sdk/fidl/fuchsia.bluetooth.snoop:fuchsia.bluetooth.snoop-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/bluetooth/examples/bt-le-battery-service/BUILD.gn b/src/connectivity/bluetooth/examples/bt-le-battery-service/BUILD.gn
index 6fbb9ab..2c6d6ee 100644
--- a/src/connectivity/bluetooth/examples/bt-le-battery-service/BUILD.gn
+++ b/src/connectivity/bluetooth/examples/bt-le-battery-service/BUILD.gn
@@ -9,11 +9,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
"//sdk/fidl/fuchsia.power:fuchsia.power-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/bluetooth/lib/bt-avdtp/BUILD.gn b/src/connectivity/bluetooth/lib/bt-avdtp/BUILD.gn
index 592c66f..0b2abba 100644
--- a/src/connectivity/bluetooth/lib/bt-avdtp/BUILD.gn
+++ b/src/connectivity/bluetooth/lib/bt-avdtp/BUILD.gn
@@ -14,10 +14,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avdtp:fuchsia.bluetooth.avdtp-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/bluetooth/lib/bt-fidl-mocks/BUILD.gn b/src/connectivity/bluetooth/lib/bt-fidl-mocks/BUILD.gn
index d82733c..a026d8e 100644
--- a/src/connectivity/bluetooth/lib/bt-fidl-mocks/BUILD.gn
+++ b/src/connectivity/bluetooth/lib/bt-fidl-mocks/BUILD.gn
@@ -12,11 +12,11 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
"//sdk/fidl/fuchsia.bluetooth.sys:fuchsia.bluetooth.sys-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/bluetooth/lib/fuchsia-audio-codec/BUILD.gn b/src/connectivity/bluetooth/lib/fuchsia-audio-codec/BUILD.gn
index f212218..344b1ca 100644
--- a/src/connectivity/bluetooth/lib/fuchsia-audio-codec/BUILD.gn
+++ b/src/connectivity/bluetooth/lib/fuchsia-audio-codec/BUILD.gn
@@ -14,9 +14,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.mediacodec:fuchsia.mediacodec-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
diff --git a/src/connectivity/bluetooth/lib/fuchsia-audio-device-output/BUILD.gn b/src/connectivity/bluetooth/lib/fuchsia-audio-device-output/BUILD.gn
index c6909ea..8881a95 100644
--- a/src/connectivity/bluetooth/lib/fuchsia-audio-device-output/BUILD.gn
+++ b/src/connectivity/bluetooth/lib/fuchsia-audio-device-output/BUILD.gn
@@ -14,9 +14,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/bluetooth/lib/fuchsia-bluetooth/BUILD.gn b/src/connectivity/bluetooth/lib/fuchsia-bluetooth/BUILD.gn
index 8f4b3a5..c264363 100644
--- a/src/connectivity/bluetooth/lib/fuchsia-bluetooth/BUILD.gn
+++ b/src/connectivity/bluetooth/lib/fuchsia-bluetooth/BUILD.gn
@@ -16,13 +16,13 @@
# TODO(armansito): Split out testing code into a separate library and move
# test-specific dependencies out.
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
"//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//sdk/fidl/fuchsia.bluetooth.sys:fuchsia.bluetooth.sys-rustc",
"//sdk/fidl/fuchsia.bluetooth.test:fuchsia.bluetooth.test-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/inspect/rust/fuchsia-inspect",
"//src/lib/inspect/rust/fuchsia-inspect-contrib",
diff --git a/src/connectivity/bluetooth/profiles/bt-a2dp-sink/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-a2dp-sink/BUILD.gn
index cc58fc2..177626e 100644
--- a/src/connectivity/bluetooth/profiles/bt-a2dp-sink/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-a2dp-sink/BUILD.gn
@@ -25,7 +25,6 @@
deps = [
":bt_a2dp_sink_metrics_rustlib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avdtp:fuchsia.bluetooth.avdtp-rustc",
"//sdk/fidl/fuchsia.bluetooth.avrcp:fuchsia.bluetooth.avrcp-rustc",
@@ -40,6 +39,7 @@
"//src/lib/argh",
"//src/lib/cobalt/rust:fuchsia-cobalt",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
diff --git a/src/connectivity/bluetooth/profiles/bt-a2dp-source/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-a2dp-source/BUILD.gn
index 99ab00c..30a96bc 100644
--- a/src/connectivity/bluetooth/profiles/bt-a2dp-source/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-a2dp-source/BUILD.gn
@@ -13,7 +13,6 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avdtp:fuchsia.bluetooth.avdtp-rustc",
"//sdk/fidl/fuchsia.bluetooth.bredr:fuchsia.bluetooth.bredr-rustc",
@@ -26,6 +25,7 @@
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/bluetooth/profiles/bt-avrcp-target/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-avrcp-target/BUILD.gn
index 6e526a8..0a54865 100644
--- a/src/connectivity/bluetooth/profiles/bt-avrcp-target/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-avrcp-target/BUILD.gn
@@ -13,13 +13,13 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avrcp:fuchsia.bluetooth.avrcp-rustc",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.media.sessions2:fuchsia.media.sessions2-rustc",
"//src/connectivity/bluetooth/lib/bt-avctp",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
diff --git a/src/connectivity/bluetooth/profiles/bt-avrcp/BUILD.gn b/src/connectivity/bluetooth/profiles/bt-avrcp/BUILD.gn
index e089511..55da9d5 100644
--- a/src/connectivity/bluetooth/profiles/bt-avrcp/BUILD.gn
+++ b/src/connectivity/bluetooth/profiles/bt-avrcp/BUILD.gn
@@ -13,7 +13,6 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avrcp:fuchsia.bluetooth.avrcp-rustc",
"//sdk/fidl/fuchsia.bluetooth.avrcp.test:fuchsia.bluetooth.avrcp.test-rustc",
@@ -21,6 +20,7 @@
"//src/connectivity/bluetooth/lib/bt-avctp",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/bluetooth/tests/integration/BUILD.gn b/src/connectivity/bluetooth/tests/integration/BUILD.gn
index 769dad2..2a3f881 100644
--- a/src/connectivity/bluetooth/tests/integration/BUILD.gn
+++ b/src/connectivity/bluetooth/tests/integration/BUILD.gn
@@ -13,7 +13,6 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//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",
@@ -24,6 +23,7 @@
"//src/connectivity/bluetooth/fidl:host-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/bluetooth/tools/bt-avdtp-tool/BUILD.gn b/src/connectivity/bluetooth/tools/bt-avdtp-tool/BUILD.gn
index ded9cf2..c30b6b8 100644
--- a/src/connectivity/bluetooth/tools/bt-avdtp-tool/BUILD.gn
+++ b/src/connectivity/bluetooth/tools/bt-avdtp-tool/BUILD.gn
@@ -13,12 +13,12 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.avdtp:fuchsia.bluetooth.avdtp-rustc",
"//src/connectivity/bluetooth/lib/bt-avdtp",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/bluetooth/tools/bt-avrcp-controller/BUILD.gn b/src/connectivity/bluetooth/tools/bt-avrcp-controller/BUILD.gn
index cddda9f..93ea39f 100644
--- a/src/connectivity/bluetooth/tools/bt-avrcp-controller/BUILD.gn
+++ b/src/connectivity/bluetooth/tools/bt-avrcp-controller/BUILD.gn
@@ -13,9 +13,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth.avrcp:fuchsia.bluetooth.avrcp-rustc",
"//sdk/fidl/fuchsia.bluetooth.avrcp.test:fuchsia.bluetooth.avrcp.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/bluetooth/tools/bt-le-central/BUILD.gn b/src/connectivity/bluetooth/tools/bt-le-central/BUILD.gn
index e53e280..efb776a 100644
--- a/src/connectivity/bluetooth/tools/bt-le-central/BUILD.gn
+++ b/src/connectivity/bluetooth/tools/bt-le-central/BUILD.gn
@@ -10,10 +10,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth.gatt:fuchsia.bluetooth.gatt-rustc",
"//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/bluetooth/tools/bt-le-peripheral/BUILD.gn b/src/connectivity/bluetooth/tools/bt-le-peripheral/BUILD.gn
index 2baa83c..bbc424c 100644
--- a/src/connectivity/bluetooth/tools/bt-le-peripheral/BUILD.gn
+++ b/src/connectivity/bluetooth/tools/bt-le-peripheral/BUILD.gn
@@ -11,10 +11,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.le:fuchsia.bluetooth.le-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/bluetooth/tools/bt-pairing-tool/BUILD.gn b/src/connectivity/bluetooth/tools/bt-pairing-tool/BUILD.gn
index 8251aa6..1c01c1b 100644
--- a/src/connectivity/bluetooth/tools/bt-pairing-tool/BUILD.gn
+++ b/src/connectivity/bluetooth/tools/bt-pairing-tool/BUILD.gn
@@ -9,9 +9,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth.control:fuchsia.bluetooth.control-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/bluetooth/tools/bt-snoop/BUILD.gn b/src/connectivity/bluetooth/tools/bt-snoop/BUILD.gn
index 6706d62..f69036b 100644
--- a/src/connectivity/bluetooth/tools/bt-snoop/BUILD.gn
+++ b/src/connectivity/bluetooth/tools/bt-snoop/BUILD.gn
@@ -13,12 +13,12 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.bluetooth:fuchsia.bluetooth-rustc",
"//sdk/fidl/fuchsia.bluetooth.snoop:fuchsia.bluetooth.snoop-rustc",
"//src/connectivity/bluetooth/lib/fuchsia-bluetooth",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/connectivity/location/regulatory_region/BUILD.gn b/src/connectivity/location/regulatory_region/BUILD.gn
index b7cdefd..373498b 100644
--- a/src/connectivity/location/regulatory_region/BUILD.gn
+++ b/src/connectivity/location/regulatory_region/BUILD.gn
@@ -12,8 +12,8 @@
edition = "2018"
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.location.namedplace:fuchsia.location.namedplace-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/lowpan/drivers/lowpan_spinel_driver/BUILD.gn b/src/connectivity/lowpan/drivers/lowpan_spinel_driver/BUILD.gn
index 5c9b570..27225f9 100644
--- a/src/connectivity/lowpan/drivers/lowpan_spinel_driver/BUILD.gn
+++ b/src/connectivity/lowpan/drivers/lowpan_spinel_driver/BUILD.gn
@@ -11,8 +11,8 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.lowpan:fuchsia.lowpan-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/lowpan/drivers/spinel_spi_driver/BUILD.gn b/src/connectivity/lowpan/drivers/spinel_spi_driver/BUILD.gn
index bf78cc1..078eb41 100644
--- a/src/connectivity/lowpan/drivers/spinel_spi_driver/BUILD.gn
+++ b/src/connectivity/lowpan/drivers/spinel_spi_driver/BUILD.gn
@@ -11,8 +11,8 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.lowpan:fuchsia.lowpan-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/lowpan/service/BUILD.gn b/src/connectivity/lowpan/service/BUILD.gn
index ae33565..4939b05b 100644
--- a/src/connectivity/lowpan/service/BUILD.gn
+++ b/src/connectivity/lowpan/service/BUILD.gn
@@ -11,8 +11,8 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.lowpan:fuchsia.lowpan-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/lowpan/tests/integration/BUILD.gn b/src/connectivity/lowpan/tests/integration/BUILD.gn
index 3d35156..e1cc00e 100644
--- a/src/connectivity/lowpan/tests/integration/BUILD.gn
+++ b/src/connectivity/lowpan/tests/integration/BUILD.gn
@@ -13,8 +13,8 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.lowpan:fuchsia.lowpan-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/lowpan/tools/lowpanctl/BUILD.gn b/src/connectivity/lowpan/tools/lowpanctl/BUILD.gn
index e771f56..1ef5b01 100644
--- a/src/connectivity/lowpan/tools/lowpanctl/BUILD.gn
+++ b/src/connectivity/lowpan/tools/lowpanctl/BUILD.gn
@@ -12,9 +12,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.lowpan:fuchsia.lowpan-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/management/network_manager/BUILD.gn b/src/connectivity/management/network_manager/BUILD.gn
index 94ab008..d9c0d36 100644
--- a/src/connectivity/management/network_manager/BUILD.gn
+++ b/src/connectivity/management/network_manager/BUILD.gn
@@ -18,13 +18,13 @@
"//garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext",
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.router.config:fuchsia.router.config-rustc",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/management/network_manager/core/BUILD.gn b/src/connectivity/management/network_manager/core/BUILD.gn
index 01e8e20..6b5dc19 100644
--- a/src/connectivity/management/network_manager/core/BUILD.gn
+++ b/src/connectivity/management/network_manager/core/BUILD.gn
@@ -13,13 +13,13 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext",
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.net.filter:fuchsia.net.filter-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.router.config:fuchsia.router.config-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -37,5 +37,5 @@
"//zircon/system/fidl/fuchsia-net:fuchsia-net-rustc",
]
- test_deps = [ "//garnet/public/lib/fidl/rust/fidl" ]
+ test_deps = [ "//src/lib/fidl/rust/fidl" ]
}
diff --git a/src/connectivity/management/network_manager_cli/BUILD.gn b/src/connectivity/management/network_manager_cli/BUILD.gn
index 17fddfe..3ff6e8e 100644
--- a/src/connectivity/management/network_manager_cli/BUILD.gn
+++ b/src/connectivity/management/network_manager_cli/BUILD.gn
@@ -16,7 +16,6 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
@@ -24,6 +23,7 @@
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sandbox-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -46,7 +46,6 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
@@ -54,6 +53,7 @@
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sandbox-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/management/reachability/BUILD.gn b/src/connectivity/management/reachability/BUILD.gn
index d31220d..c9c5e07 100644
--- a/src/connectivity/management/reachability/BUILD.gn
+++ b/src/connectivity/management/reachability/BUILD.gn
@@ -16,10 +16,10 @@
deps = [
"core:lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//src/connectivity/management/network_manager/core:lib",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/management/reachability/core/BUILD.gn b/src/connectivity/management/reachability/core/BUILD.gn
index 3ddd5a5..62a2821 100644
--- a/src/connectivity/management/reachability/core/BUILD.gn
+++ b/src/connectivity/management/reachability/core/BUILD.gn
@@ -15,13 +15,13 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.net.filter:fuchsia.net.filter-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.router.config:fuchsia.router.config-rustc",
"//src/connectivity/management/network_manager/core:lib",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -33,7 +33,7 @@
"//zircon/system/fidl/fuchsia-net:fuchsia-net-rustc",
]
- test_deps = [ "//garnet/public/lib/fidl/rust/fidl" ]
+ test_deps = [ "//src/lib/fidl/rust/fidl" ]
}
static_library("ext_ping") {
diff --git a/src/connectivity/management/reachability/tests/BUILD.gn b/src/connectivity/management/reachability/tests/BUILD.gn
index fefb3fd..558d742 100644
--- a/src/connectivity/management/reachability/tests/BUILD.gn
+++ b/src/connectivity/management/reachability/tests/BUILD.gn
@@ -12,12 +12,12 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//src/connectivity/management/network_manager_cli:lib",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sandbox-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/management/tests/network_manager_e2e_tests/nat/BUILD.gn b/src/connectivity/management/tests/network_manager_e2e_tests/nat/BUILD.gn
index 2006957..73b6639 100644
--- a/src/connectivity/management/tests/network_manager_e2e_tests/nat/BUILD.gn
+++ b/src/connectivity/management/tests/network_manager_e2e_tests/nat/BUILD.gn
@@ -7,10 +7,10 @@
rustc_binary("network_manager_e2e_nat") {
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.router.config:fuchsia.router.config-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/management/tests/network_manager_integration_tests/BUILD.gn b/src/connectivity/management/tests/network_manager_integration_tests/BUILD.gn
index c83c45f..b0b49ef 100644
--- a/src/connectivity/management/tests/network_manager_integration_tests/BUILD.gn
+++ b/src/connectivity/management/tests/network_manager_integration_tests/BUILD.gn
@@ -12,7 +12,6 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
@@ -21,6 +20,7 @@
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sandbox-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/dhcp/BUILD.gn b/src/connectivity/network/dhcp/BUILD.gn
index 23df9f8..1d6e2dd 100644
--- a/src/connectivity/network/dhcp/BUILD.gn
+++ b/src/connectivity/network/dhcp/BUILD.gn
@@ -16,9 +16,9 @@
"//garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext",
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/never",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -54,9 +54,9 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/dhcpd-cli/BUILD.gn b/src/connectivity/network/dhcpd-cli/BUILD.gn
index 90f28f3..2f2d130 100644
--- a/src/connectivity/network/dhcpd-cli/BUILD.gn
+++ b/src/connectivity/network/dhcpd-cli/BUILD.gn
@@ -15,9 +15,9 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_hardware_ethernet_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/http_client/BUILD.gn b/src/connectivity/network/http_client/BUILD.gn
index 63510bf..a7194d7 100644
--- a/src/connectivity/network/http_client/BUILD.gn
+++ b/src/connectivity/network/http_client/BUILD.gn
@@ -17,9 +17,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-hyper",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/http_client/integration/BUILD.gn b/src/connectivity/network/http_client/integration/BUILD.gn
index 14a72b3..2f45e79 100644
--- a/src/connectivity/network/http_client/integration/BUILD.gn
+++ b/src/connectivity/network/http_client/integration/BUILD.gn
@@ -20,9 +20,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/connectivity/network/net-cli/BUILD.gn b/src/connectivity/network/net-cli/BUILD.gn
index f670fb2..7294b7d 100644
--- a/src/connectivity/network/net-cli/BUILD.gn
+++ b/src/connectivity/network/net-cli/BUILD.gn
@@ -18,12 +18,12 @@
"//garnet/lib/rust/fidl_fuchsia_netstack_ext",
"//garnet/lib/rust/io_util",
"//garnet/lib/rust/netfilter",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.filter:fuchsia.net.filter-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/netcfg/BUILD.gn b/src/connectivity/network/netcfg/BUILD.gn
index 38885d7..74d7983 100644
--- a/src/connectivity/network/netcfg/BUILD.gn
+++ b/src/connectivity/network/netcfg/BUILD.gn
@@ -22,12 +22,12 @@
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
"//garnet/lib/rust/fidl_fuchsia_netstack_ext",
"//garnet/lib/rust/netfilter",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.net.filter:fuchsia.net.filter-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/network/netdump/integration/basic_integration/BUILD.gn b/src/connectivity/network/netdump/integration/basic_integration/BUILD.gn
index dffb8be..60bfa6e 100644
--- a/src/connectivity/network/netdump/integration/basic_integration/BUILD.gn
+++ b/src/connectivity/network/netdump/integration/basic_integration/BUILD.gn
@@ -7,12 +7,12 @@
rustc_binary("basic_integration") {
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/lib/net-types",
"//src/connectivity/network/netdump/integration/helper",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/network/netdump/integration/filter_integration/BUILD.gn b/src/connectivity/network/netdump/integration/filter_integration/BUILD.gn
index a0fb82f..69a6d06 100644
--- a/src/connectivity/network/netdump/integration/filter_integration/BUILD.gn
+++ b/src/connectivity/network/netdump/integration/filter_integration/BUILD.gn
@@ -7,12 +7,12 @@
rustc_binary("filter_integration") {
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/lib/net-types",
"//src/connectivity/network/netdump/integration/helper",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/network/netdump/integration/helper/BUILD.gn b/src/connectivity/network/netdump/integration/helper/BUILD.gn
index 61080f4..e97dd88 100644
--- a/src/connectivity/network/netdump/integration/helper/BUILD.gn
+++ b/src/connectivity/network/netdump/integration/helper/BUILD.gn
@@ -9,12 +9,12 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/lib/net-types",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/netstack3/BUILD.gn b/src/connectivity/network/netstack3/BUILD.gn
index 14e187f..0c798a8 100644
--- a/src/connectivity/network/netstack3/BUILD.gn
+++ b/src/connectivity/network/netstack3/BUILD.gn
@@ -19,12 +19,12 @@
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
"//garnet/lib/rust/never",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.icmp:fuchsia.net.icmp-rustc",
"//sdk/fidl/fuchsia.net.icmp:fuchsia.net.icmp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//src/connectivity/lib/net-types",
"//src/connectivity/lib/packet",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/netstack3/tools/enclosed_runner/BUILD.gn b/src/connectivity/network/netstack3/tools/enclosed_runner/BUILD.gn
index 29d2860..45173dd 100644
--- a/src/connectivity/network/netstack3/tools/enclosed_runner/BUILD.gn
+++ b/src/connectivity/network/netstack3/tools/enclosed_runner/BUILD.gn
@@ -11,10 +11,10 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.icmp:fuchsia.net.icmp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/ping3/BUILD.gn b/src/connectivity/network/ping3/BUILD.gn
index b904eb4..0ace68f7 100644
--- a/src/connectivity/network/ping3/BUILD.gn
+++ b/src/connectivity/network/ping3/BUILD.gn
@@ -14,9 +14,9 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.icmp:fuchsia.net.icmp-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/helpers/mock_device_settings/BUILD.gn b/src/connectivity/network/testing/netemul/runner/helpers/mock_device_settings/BUILD.gn
index 74afafd..1d3a93c 100644
--- a/src/connectivity/network/testing/netemul/runner/helpers/mock_device_settings/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/helpers/mock_device_settings/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/fidl_fuchsia_netstack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.devicesettings:fuchsia.devicesettings-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/helpers/netstack_cfg/BUILD.gn b/src/connectivity/network/testing/netemul/runner/helpers/netstack_cfg/BUILD.gn
index 80e9ae2..9230a27 100644
--- a/src/connectivity/network/testing/netemul/runner/helpers/netstack_cfg/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/helpers/netstack_cfg/BUILD.gn
@@ -12,12 +12,12 @@
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
"//garnet/lib/rust/fidl_fuchsia_netstack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/test/dummy_proc/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/dummy_proc/BUILD.gn
index ae50f95..e66fc8c 100644
--- a/src/connectivity/network/testing/netemul/runner/test/dummy_proc/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/dummy_proc/BUILD.gn
@@ -9,9 +9,9 @@
name = "dummy_proc"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/test/dynamic_devices/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/dynamic_devices/BUILD.gn
index 8d5bb51..814799d 100644
--- a/src/connectivity/network/testing/netemul/runner/test/dynamic_devices/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/dynamic_devices/BUILD.gn
@@ -9,10 +9,10 @@
name = "dynamic_devices"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/testing/netemul/runner/test/easy_netstack_cfg/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/easy_netstack_cfg/BUILD.gn
index 2e10cae6..65f6120 100644
--- a/src/connectivity/network/testing/netemul/runner/test/easy_netstack_cfg/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/easy_netstack_cfg/BUILD.gn
@@ -11,10 +11,10 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/test/env_build/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/env_build/BUILD.gn
index d627811..30486e2 100644
--- a/src/connectivity/network/testing/netemul/runner/test/env_build/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/env_build/BUILD.gn
@@ -9,9 +9,9 @@
name = "env_build"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/test/guest/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/guest/BUILD.gn
index aa6c8a6..4f2f0236 100644
--- a/src/connectivity/network/testing/netemul/runner/test/guest/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/guest/BUILD.gn
@@ -12,9 +12,9 @@
deps = [
":lib",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.virtualization:fuchsia.virtualization-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -31,8 +31,8 @@
edition = "2018"
name = "netemul_guest_lib"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zircon/rust:fuchsia-zircon",
"//src/virtualization/lib/guest_interaction:fuchsia.netemul.guest-rustc",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/network/testing/netemul/runner/test/guest_grpc_stress/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/guest_grpc_stress/BUILD.gn
index 0fbb8807..07ceb7b 100644
--- a/src/connectivity/network/testing/netemul/runner/test/guest_grpc_stress/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/guest_grpc_stress/BUILD.gn
@@ -11,10 +11,10 @@
edition = "2018"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.virtualization:fuchsia.virtualization-rustc",
"//src/connectivity/network/testing/netemul/runner/test/guest:lib",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/testing/netemul/runner/test/inheritance/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/inheritance/BUILD.gn
index 0fde009..05a76da 100644
--- a/src/connectivity/network/testing/netemul/runner/test/inheritance/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/inheritance/BUILD.gn
@@ -15,9 +15,9 @@
edition = "2018"
deps = [
":counter-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/testing/netemul/runner/test/multiple_guests/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/multiple_guests/BUILD.gn
index 13f5f83..12d29d6 100644
--- a/src/connectivity/network/testing/netemul/runner/test/multiple_guests/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/multiple_guests/BUILD.gn
@@ -10,10 +10,10 @@
edition = "2018"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.virtualization:fuchsia.virtualization-rustc",
"//src/connectivity/network/testing/netemul/runner/test/guest:lib",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/testing/netemul/runner/test/netstack_intermediary/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/netstack_intermediary/BUILD.gn
index 233e877..25fa3bcf 100644
--- a/src/connectivity/network/testing/netemul/runner/test/netstack_intermediary/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/netstack_intermediary/BUILD.gn
@@ -10,11 +10,11 @@
edition = "2018"
deps = [
"//garnet/lib/rust/ethernet",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/network/testing/netemul/runner/test/netstack_socks/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/netstack_socks/BUILD.gn
index 30d026d..34638ff 100644
--- a/src/connectivity/network/testing/netemul/runner/test/netstack_socks/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/netstack_socks/BUILD.gn
@@ -11,12 +11,12 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_ext",
"//garnet/lib/rust/fidl_fuchsia_netstack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/testing/netemul/runner/test/sandbox_service/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/sandbox_service/BUILD.gn
index 98b0058..580f0a7 100644
--- a/src/connectivity/network/testing/netemul/runner/test/sandbox_service/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/sandbox_service/BUILD.gn
@@ -10,13 +10,13 @@
edition = "2018"
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sandbox-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/testing/netemul/runner/test/svc_list/BUILD.gn b/src/connectivity/network/testing/netemul/runner/test/svc_list/BUILD.gn
index 1412ed2..d533298 100644
--- a/src/connectivity/network/testing/netemul/runner/test/svc_list/BUILD.gn
+++ b/src/connectivity/network/testing/netemul/runner/test/svc_list/BUILD.gn
@@ -9,12 +9,12 @@
name = "svc_list"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/tests/BUILD.gn b/src/connectivity/network/tests/BUILD.gn
index 74d2da7..81cb583 100644
--- a/src/connectivity/network/tests/BUILD.gn
+++ b/src/connectivity/network/tests/BUILD.gn
@@ -24,7 +24,6 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
@@ -33,6 +32,7 @@
"//src/connectivity/network/testing/netemul/lib/fidl:environment-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sandbox-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -51,10 +51,10 @@
edition = "2018"
source_root = "src/cobalt.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.cobalt.test:fuchsia.cobalt.test-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//src/connectivity/network/netstack:networking_metrics_rustlib",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/tests/connect/BUILD.gn b/src/connectivity/network/tests/connect/BUILD.gn
index 7fdeb66..7787599 100644
--- a/src/connectivity/network/tests/connect/BUILD.gn
+++ b/src/connectivity/network/tests/connect/BUILD.gn
@@ -8,10 +8,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/network/testing/netemul/lib/fidl:network-rustc",
"//src/connectivity/network/testing/netemul/lib/fidl:sync-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/network/tests/getaddrinfo/BUILD.gn b/src/connectivity/network/tests/getaddrinfo/BUILD.gn
index a5f5f69..77fdf05 100644
--- a/src/connectivity/network/tests/getaddrinfo/BUILD.gn
+++ b/src/connectivity/network/tests/getaddrinfo/BUILD.gn
@@ -18,9 +18,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/network/tests/integration/dhcp/dhcp_validity/BUILD.gn b/src/connectivity/network/tests/integration/dhcp/dhcp_validity/BUILD.gn
index d97128d..ed5d3fe 100644
--- a/src/connectivity/network/tests/integration/dhcp/dhcp_validity/BUILD.gn
+++ b/src/connectivity/network/tests/integration/dhcp/dhcp_validity/BUILD.gn
@@ -26,9 +26,9 @@
name = "dhcp_validity_lib"
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//src/connectivity/network/testing/netemul/runner/test/guest:lib",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/overnet/examples/echo/BUILD.gn b/src/connectivity/overnet/examples/echo/BUILD.gn
index 518dbdc..6c3051e 100644
--- a/src/connectivity/overnet/examples/echo/BUILD.gn
+++ b/src/connectivity/overnet/examples/echo/BUILD.gn
@@ -21,10 +21,10 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//src/connectivity/overnet/lib/hoist",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
"//third_party/rust_crates:log",
diff --git a/src/connectivity/overnet/examples/interface_passing/BUILD.gn b/src/connectivity/overnet/examples/interface_passing/BUILD.gn
index 04a5af0..1d04951 100644
--- a/src/connectivity/overnet/examples/interface_passing/BUILD.gn
+++ b/src/connectivity/overnet/examples/interface_passing/BUILD.gn
@@ -21,10 +21,10 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//src/connectivity/overnet/examples/interface_passing/service:interface_passing-rustc",
"//src/connectivity/overnet/lib/hoist",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:clap",
"//third_party/rust_crates:futures",
diff --git a/src/connectivity/overnet/lib/core/BUILD.gn b/src/connectivity/overnet/lib/core/BUILD.gn
index 2fe579b..3001639 100644
--- a/src/connectivity/overnet/lib/core/BUILD.gn
+++ b/src/connectivity/overnet/lib/core/BUILD.gn
@@ -12,10 +12,10 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
"//src/connectivity/overnet/lib/salt_slab",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zircon/rust:fuchsia-zircon-status",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:byteorder",
diff --git a/src/connectivity/overnet/lib/hoist/BUILD.gn b/src/connectivity/overnet/lib/hoist/BUILD.gn
index 78f062c..62349cb2 100644
--- a/src/connectivity/overnet/lib/hoist/BUILD.gn
+++ b/src/connectivity/overnet/lib/hoist/BUILD.gn
@@ -10,9 +10,9 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
"//third_party/rust_crates:thiserror",
diff --git a/src/connectivity/overnet/lib/integration_tests/BUILD.gn b/src/connectivity/overnet/lib/integration_tests/BUILD.gn
index 347084c..7a63a7e 100644
--- a/src/connectivity/overnet/lib/integration_tests/BUILD.gn
+++ b/src/connectivity/overnet/lib/integration_tests/BUILD.gn
@@ -12,11 +12,11 @@
edition = "2018"
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
"//src/connectivity/overnet/lib/core",
"//src/connectivity/overnet/lib/hoist",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
"//third_party/rust_crates:log",
diff --git a/src/connectivity/overnet/overnetstack/BUILD.gn b/src/connectivity/overnet/overnetstack/BUILD.gn
index 1583d0e..5e3ae4f 100644
--- a/src/connectivity/overnet/overnetstack/BUILD.gn
+++ b/src/connectivity/overnet/overnetstack/BUILD.gn
@@ -11,12 +11,12 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.mdns:fuchsia.net.mdns-rustc",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
"//src/connectivity/overnet/lib/core",
"//src/connectivity/overnet/lib/salt_slab",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/overnet/tools/ascendd/BUILD.gn b/src/connectivity/overnet/tools/ascendd/BUILD.gn
index 9829792..6be97fc 100644
--- a/src/connectivity/overnet/tools/ascendd/BUILD.gn
+++ b/src/connectivity/overnet/tools/ascendd/BUILD.gn
@@ -13,11 +13,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
"//src/connectivity/overnet/lib/core",
"//src/connectivity/overnet/lib/hoist",
"//src/connectivity/overnet/lib/salt_slab",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:clap",
"//third_party/rust_crates:futures",
diff --git a/src/connectivity/overnet/tools/onet/BUILD.gn b/src/connectivity/overnet/tools/onet/BUILD.gn
index 5289482..8c2d39d 100644
--- a/src/connectivity/overnet/tools/onet/BUILD.gn
+++ b/src/connectivity/overnet/tools/onet/BUILD.gn
@@ -11,11 +11,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
"//src/connectivity/overnet/lib/core",
"//src/connectivity/overnet/lib/hoist",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:clap",
"//third_party/rust_crates:futures",
diff --git a/src/connectivity/telephony/lib/qmi/BUILD.gn b/src/connectivity/telephony/lib/qmi/BUILD.gn
index 442aa01..d5e3c23a 100644
--- a/src/connectivity/telephony/lib/qmi/BUILD.gn
+++ b/src/connectivity/telephony/lib/qmi/BUILD.gn
@@ -8,8 +8,8 @@
rustc_library("qmi") {
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/telephony/ril-qmi/BUILD.gn b/src/connectivity/telephony/ril-qmi/BUILD.gn
index 40eae5e..b6aa2ee 100644
--- a/src/connectivity/telephony/ril-qmi/BUILD.gn
+++ b/src/connectivity/telephony/ril-qmi/BUILD.gn
@@ -13,9 +13,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.telephony.ril:fuchsia.telephony.ril-rustc",
"//src/connectivity/telephony/lib/qmi-protocol",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/telephony/telephony-snooper/BUILD.gn b/src/connectivity/telephony/telephony-snooper/BUILD.gn
index 3ca1b9f..cd09f15 100644
--- a/src/connectivity/telephony/telephony-snooper/BUILD.gn
+++ b/src/connectivity/telephony/telephony-snooper/BUILD.gn
@@ -10,11 +10,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/telephony/lib/qmi",
"//src/connectivity/telephony/tests/tel-dev:tel_dev",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/telephony/telephony/BUILD.gn b/src/connectivity/telephony/telephony/BUILD.gn
index 8dd6893..1342b73 100644
--- a/src/connectivity/telephony/telephony/BUILD.gn
+++ b/src/connectivity/telephony/telephony/BUILD.gn
@@ -12,12 +12,12 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.telephony.manager:fuchsia.telephony.manager-rustc",
"//sdk/fidl/fuchsia.telephony.ril:fuchsia.telephony.ril-rustc",
"//src/connectivity/telephony/lib/qmi",
"//src/connectivity/telephony/tests/tel-dev:tel_dev",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/connectivity/telephony/tests/component-integration/fake-qmi-query/BUILD.gn b/src/connectivity/telephony/tests/component-integration/fake-qmi-query/BUILD.gn
index 6cdf0a2..c45e40f0 100644
--- a/src/connectivity/telephony/tests/component-integration/fake-qmi-query/BUILD.gn
+++ b/src/connectivity/telephony/tests/component-integration/fake-qmi-query/BUILD.gn
@@ -9,12 +9,12 @@
edition = "2018"
deps = [
"//garnet/lib/rust/files_async",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.telephony.ril:fuchsia.telephony.ril-rustc",
"//src/connectivity/telephony/lib/qmi",
"//src/connectivity/telephony/lib/tel-devmgr/fidl:devmgr-rustc",
"//src/connectivity/telephony/tests/tel-dev:tel_dev",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/connectivity/telephony/tests/component-integration/snooper/BUILD.gn b/src/connectivity/telephony/tests/component-integration/snooper/BUILD.gn
index de9e7b9..c4c4fea 100644
--- a/src/connectivity/telephony/tests/component-integration/snooper/BUILD.gn
+++ b/src/connectivity/telephony/tests/component-integration/snooper/BUILD.gn
@@ -10,10 +10,10 @@
edition = "2018"
deps = [
"//garnet/lib/rust/files_async",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/telephony/lib/qmi",
"//src/connectivity/telephony/tests/tel-dev:tel_dev",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/telephony/tests/tel-dev/BUILD.gn b/src/connectivity/telephony/tests/tel-dev/BUILD.gn
index 9cb5308..7b21e90 100644
--- a/src/connectivity/telephony/tests/tel-dev/BUILD.gn
+++ b/src/connectivity/telephony/tests/tel-dev/BUILD.gn
@@ -9,9 +9,9 @@
deps = [
"//garnet/lib/rust/files_async",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/telephony/lib/tel-devmgr/fidl:devmgr-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/telephony/tools/ril-ctl/BUILD.gn b/src/connectivity/telephony/tools/ril-ctl/BUILD.gn
index fd11bb9..ad74073 100644
--- a/src/connectivity/telephony/tools/ril-ctl/BUILD.gn
+++ b/src/connectivity/telephony/tools/ril-ctl/BUILD.gn
@@ -11,13 +11,13 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_net_stack_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.dhcp:fuchsia.net.dhcp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
"//sdk/fidl/fuchsia.netstack:fuchsia.netstack-rustc",
"//sdk/fidl/fuchsia.telephony.manager:fuchsia.telephony.manager-rustc",
"//sdk/fidl/fuchsia.telephony.ril:fuchsia.telephony.ril-rustc",
"//src/connectivity/telephony/lib/qmi",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/drivers/testing/util/BUILD.gn b/src/connectivity/wlan/drivers/testing/util/BUILD.gn
index 4306ccfb..82ba496 100644
--- a/src/connectivity/wlan/drivers/testing/util/BUILD.gn
+++ b/src/connectivity/wlan/drivers/testing/util/BUILD.gn
@@ -10,9 +10,9 @@
deps = [
"//garnet/lib/wlan/fidl:fidl-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/wlan/lib/wlan_dev",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/wlan/lib/mlme/rust/BUILD.gn b/src/connectivity/wlan/lib/mlme/rust/BUILD.gn
index a263f7f..fe131df 100644
--- a/src/connectivity/wlan/lib/mlme/rust/BUILD.gn
+++ b/src/connectivity/wlan/lib/mlme/rust/BUILD.gn
@@ -13,12 +13,12 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common-rustc",
"//sdk/fidl/fuchsia.wlan.mlme:fuchsia.wlan.mlme-rustc",
"//sdk/fidl/fuchsia.wlan.stats:fuchsia.wlan.stats-rustc",
"//src/connectivity/wlan/lib/common/rust:wlan-common",
"//src/connectivity/wlan/lib/statemachine:wlan-statemachine",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/syslog/rust:syslog",
"//src/lib/zerocopy",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/lib/mlme/rust/c-binding/BUILD.gn b/src/connectivity/wlan/lib/mlme/rust/c-binding/BUILD.gn
index 349a9c2..aca606c 100644
--- a/src/connectivity/wlan/lib/mlme/rust/c-binding/BUILD.gn
+++ b/src/connectivity/wlan/lib/mlme/rust/c-binding/BUILD.gn
@@ -13,11 +13,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.mlme:fuchsia.wlan.mlme-rustc",
"//src/connectivity/wlan/lib/common/rust:wlan-common",
"//src/connectivity/wlan/lib/mlme/rust:wlan-mlme",
"//src/connectivity/wlan/lib/span:wlan-span",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zerocopy",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/wlan/lib/wlan_dev/BUILD.gn b/src/connectivity/wlan/lib/wlan_dev/BUILD.gn
index a82b3de..fdd944e 100644
--- a/src/connectivity/wlan/lib/wlan_dev/BUILD.gn
+++ b/src/connectivity/wlan/lib/wlan_dev/BUILD.gn
@@ -9,10 +9,10 @@
deps = [
"//garnet/lib/wlan/fidl:fidl-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.mlme:fuchsia.wlan.mlme-rustc",
"//src/connectivity/wlan/testing/wlan-devmgr/fidl:devmgr-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/testing/ap-smoke-test/BUILD.gn b/src/connectivity/wlan/testing/ap-smoke-test/BUILD.gn
index 873b450..9ab0ce8 100644
--- a/src/connectivity/wlan/testing/ap-smoke-test/BUILD.gn
+++ b/src/connectivity/wlan/testing/ap-smoke-test/BUILD.gn
@@ -14,9 +14,9 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/wlan/testing/client-smoke-test/BUILD.gn b/src/connectivity/wlan/testing/client-smoke-test/BUILD.gn
index c73aad1..9095cc9 100644
--- a/src/connectivity/wlan/testing/client-smoke-test/BUILD.gn
+++ b/src/connectivity/wlan/testing/client-smoke-test/BUILD.gn
@@ -17,9 +17,9 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
"//sdk/fidl/fuchsia.net.stack:fuchsia.net.stack-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/wlan/testing/client-stress-test/BUILD.gn b/src/connectivity/wlan/testing/client-stress-test/BUILD.gn
index d65f292..04545b1 100644
--- a/src/connectivity/wlan/testing/client-stress-test/BUILD.gn
+++ b/src/connectivity/wlan/testing/client-stress-test/BUILD.gn
@@ -14,7 +14,7 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/connectivity/wlan/testing/hw-sim/BUILD.gn b/src/connectivity/wlan/testing/hw-sim/BUILD.gn
index d1c113f..bbb389b 100644
--- a/src/connectivity/wlan/testing/hw-sim/BUILD.gn
+++ b/src/connectivity/wlan/testing/hw-sim/BUILD.gn
@@ -18,7 +18,6 @@
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
"//garnet/lib/wlan/fidl:wlantap-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common-rustc",
"//sdk/fidl/fuchsia.wlan.mlme:fuchsia.wlan.mlme-rustc",
"//sdk/fidl/fuchsia.wlan.service:fuchsia.wlan.service-rustc",
@@ -29,6 +28,7 @@
"//src/connectivity/wlan/testing/wlan-devmgr/fidl:devmgr-rustc",
"//src/connectivity/wlan/testing/wlantap-client",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zerocopy",
diff --git a/src/connectivity/wlan/testing/hw-sim/test/open_ap_connect/BUILD.gn b/src/connectivity/wlan/testing/hw-sim/test/open_ap_connect/BUILD.gn
index 9194c81..86b49eb 100644
--- a/src/connectivity/wlan/testing/hw-sim/test/open_ap_connect/BUILD.gn
+++ b/src/connectivity/wlan/testing/hw-sim/test/open_ap_connect/BUILD.gn
@@ -11,9 +11,9 @@
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
"//garnet/lib/wlan/fidl:wlantap-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/wlan/lib/common/rust:wlan-common",
"//src/connectivity/wlan/testing/hw-sim:wlan-hw-sim",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/testing/hw-sim/test/sim_client_vs_sim_ap/BUILD.gn b/src/connectivity/wlan/testing/hw-sim/test/sim_client_vs_sim_ap/BUILD.gn
index 0fe7868..800defe 100644
--- a/src/connectivity/wlan/testing/hw-sim/test/sim_client_vs_sim_ap/BUILD.gn
+++ b/src/connectivity/wlan/testing/hw-sim/test/sim_client_vs_sim_ap/BUILD.gn
@@ -12,10 +12,10 @@
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
"//garnet/lib/wlan/fidl:wlantap-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.service:fuchsia.wlan.service-rustc",
"//src/connectivity/wlan/lib/common/rust:wlan-common",
"//src/connectivity/wlan/testing/hw-sim:wlan-hw-sim",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/testing/wlantap-client/BUILD.gn b/src/connectivity/wlan/testing/wlantap-client/BUILD.gn
index 7f9fdb1..1034bb3 100644
--- a/src/connectivity/wlan/testing/wlantap-client/BUILD.gn
+++ b/src/connectivity/wlan/testing/wlantap-client/BUILD.gn
@@ -11,10 +11,10 @@
deps = [
"//garnet/lib/wlan/fidl:wlantap-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/connectivity/wlan/lib/wlan_dev",
"//src/connectivity/wlan/testing/wlan-devmgr/fidl:devmgr-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/connectivity/wlan/tools/wlantool/BUILD.gn b/src/connectivity/wlan/tools/wlantool/BUILD.gn
index c76f3b9..30f2fb0 100644
--- a/src/connectivity/wlan/tools/wlantool/BUILD.gn
+++ b/src/connectivity/wlan/tools/wlantool/BUILD.gn
@@ -16,11 +16,11 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common-rustc",
"//sdk/fidl/fuchsia.wlan.minstrel:fuchsia.wlan.minstrel-rustc",
"//src/connectivity/wlan/lib/common/rust:wlan-common",
"//src/connectivity/wlan/lib/rsn:wlan-rsn",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/wlancfg/BUILD.gn b/src/connectivity/wlan/wlancfg/BUILD.gn
index e4a0919..fb8836f 100644
--- a/src/connectivity/wlan/wlancfg/BUILD.gn
+++ b/src/connectivity/wlan/wlancfg/BUILD.gn
@@ -25,13 +25,13 @@
"//garnet/lib/wlan/fidl:fidl-rustc",
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.ap:fuchsia.wlan.ap.policy-rustc",
"//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common-rustc",
"//sdk/fidl/fuchsia.wlan.policy:fuchsia.wlan.policy-rustc",
"//sdk/fidl/fuchsia.wlan.service:fuchsia.wlan.service-rustc",
"//sdk/fidl/fuchsia.wlan.stats:fuchsia.wlan.stats-rustc",
"//src/connectivity/wlan/lib/common/rust/:wlan-common",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/connectivity/wlan/wlanstack/BUILD.gn b/src/connectivity/wlan/wlanstack/BUILD.gn
index 8334ee9..57e97f6 100644
--- a/src/connectivity/wlan/wlanstack/BUILD.gn
+++ b/src/connectivity/wlan/wlanstack/BUILD.gn
@@ -32,7 +32,6 @@
"//garnet/lib/wlan/fidl:service-rustc",
"//garnet/lib/wlan/fidl:sme-rustc",
"//garnet/lib/wlan/fidl:wlantap-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common-rustc",
"//sdk/fidl/fuchsia.wlan.mesh:fuchsia.wlan.mesh-rustc",
"//sdk/fidl/fuchsia.wlan.minstrel:fuchsia.wlan.minstrel-rustc",
@@ -46,6 +45,7 @@
"//src/connectivity/wlan/testing/wlantap-client",
"//src/lib/cobalt/rust:fuchsia-cobalt",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/developer/development-bridge/BUILD.gn b/src/developer/development-bridge/BUILD.gn
index 0fd80bb..272e661 100644
--- a/src/developer/development-bridge/BUILD.gn
+++ b/src/developer/development-bridge/BUILD.gn
@@ -17,10 +17,10 @@
deps = [
":bridge-rustc",
":daemon",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//src/connectivity/overnet/lib/hoist",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
"//third_party/rust_crates:log",
@@ -39,11 +39,11 @@
deps = [
":bridge-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//src/connectivity/overnet/lib/hoist",
"//src/connectivity/overnet/tools/ascendd:lib",
"//src/developer/remote-control/service:remote-control-rustc",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
"//third_party/rust_crates:log",
diff --git a/src/developer/remote-control/BUILD.gn b/src/developer/remote-control/BUILD.gn
index 567f41a..a909046 100644
--- a/src/developer/remote-control/BUILD.gn
+++ b/src/developer/remote-control/BUILD.gn
@@ -21,11 +21,11 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/overnet/lib/hoist",
"//src/developer/remote-control/service:remote-control-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -42,11 +42,11 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/connectivity/overnet/lib/hoist",
"//src/developer/remote-control/service:remote-control-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/diagnostics/archivist/BUILD.gn b/src/diagnostics/archivist/BUILD.gn
index a2b81ca6..d86aa6f 100644
--- a/src/diagnostics/archivist/BUILD.gn
+++ b/src/diagnostics/archivist/BUILD.gn
@@ -16,7 +16,6 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.diagnostics:fuchsia.diagnostics-rustc",
"//sdk/fidl/fuchsia.diagnostics.stream:fuchsia.diagnostics.stream-rustc",
"//sdk/fidl/fuchsia.sys.internal:fuchsia.sys.internal-rustc",
@@ -26,6 +25,7 @@
"//src/diagnostics/lib/validating-log-listener",
"//src/diagnostics/streams:lib",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
@@ -65,9 +65,9 @@
deps = [
":lib",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/diagnostics/lib/selectors",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/diagnostics/archivist/tests/data_stats/BUILD.gn b/src/diagnostics/archivist/tests/data_stats/BUILD.gn
index 3aa433d..dbca329 100644
--- a/src/diagnostics/archivist/tests/data_stats/BUILD.gn
+++ b/src/diagnostics/archivist/tests/data_stats/BUILD.gn
@@ -11,8 +11,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.diagnostics:fuchsia.diagnostics-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/diagnostics/archivist/tests/inspect_reader_integration/BUILD.gn b/src/diagnostics/archivist/tests/inspect_reader_integration/BUILD.gn
index 168120f..2bfc265 100644
--- a/src/diagnostics/archivist/tests/inspect_reader_integration/BUILD.gn
+++ b/src/diagnostics/archivist/tests/inspect_reader_integration/BUILD.gn
@@ -11,11 +11,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-hyper",
"//sdk/fidl/fuchsia.diagnostics:fuchsia.diagnostics-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/cobalt/rust:fuchsia-cobalt",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/diagnostics/archivist/tests/unified_reader/BUILD.gn b/src/diagnostics/archivist/tests/unified_reader/BUILD.gn
index 24416a9..c72d0e1 100644
--- a/src/diagnostics/archivist/tests/unified_reader/BUILD.gn
+++ b/src/diagnostics/archivist/tests/unified_reader/BUILD.gn
@@ -9,11 +9,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.diagnostics:fuchsia.diagnostics-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/cstr",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/diagnostics/inspect_validator/BUILD.gn b/src/diagnostics/inspect_validator/BUILD.gn
index 45c9590..d8e018d 100644
--- a/src/diagnostics/inspect_validator/BUILD.gn
+++ b/src/diagnostics/inspect_validator/BUILD.gn
@@ -18,9 +18,9 @@
}
validator_deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/diagnostics/inspect_validator/fidl:validate-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/diagnostics/inspect_validator/lib/rust/BUILD.gn b/src/diagnostics/inspect_validator/lib/rust/BUILD.gn
index c212206..e142563 100644
--- a/src/diagnostics/inspect_validator/lib/rust/BUILD.gn
+++ b/src/diagnostics/inspect_validator/lib/rust/BUILD.gn
@@ -13,8 +13,8 @@
testonly = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/diagnostics/inspect_validator/fidl:validate-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/diagnostics/iquery/BUILD.gn b/src/diagnostics/iquery/BUILD.gn
index 3d25d39..a2bc15a 100644
--- a/src/diagnostics/iquery/BUILD.gn
+++ b/src/diagnostics/iquery/BUILD.gn
@@ -14,10 +14,10 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/diagnostics/lib/inspect-fidl-load",
"//src/diagnostics/lib/inspect-formatter",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/inspect/rust/fuchsia-inspect",
"//src/lib/syslog/rust:syslog",
diff --git a/src/diagnostics/lib/inspect-fidl-load/BUILD.gn b/src/diagnostics/lib/inspect-fidl-load/BUILD.gn
index be20ba5..5eaacf6 100644
--- a/src/diagnostics/lib/inspect-fidl-load/BUILD.gn
+++ b/src/diagnostics/lib/inspect-fidl-load/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/inspect/rust/fuchsia-inspect",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/diagnostics/lib/validating-log-listener/BUILD.gn b/src/diagnostics/lib/validating-log-listener/BUILD.gn
index 81d8e42..6de0d61 100644
--- a/src/diagnostics/lib/validating-log-listener/BUILD.gn
+++ b/src/diagnostics/lib/validating-log-listener/BUILD.gn
@@ -11,7 +11,7 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//third_party/rust_crates:futures",
"//zircon/system/fidl/fuchsia-logger:fuchsia-logger-rustc",
diff --git a/src/diagnostics/tool/BUILD.gn b/src/diagnostics/tool/BUILD.gn
index 1263b7f..4daf1fb 100644
--- a/src/diagnostics/tool/BUILD.gn
+++ b/src/diagnostics/tool/BUILD.gn
@@ -15,10 +15,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.diagnostics:fuchsia.diagnostics-rustc",
"//src/connectivity/overnet/lib/hoist",
"//src/diagnostics/lib/selectors",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:byteorder",
"//third_party/rust_crates:clap",
diff --git a/src/diagnostics/transit_bench/BUILD.gn b/src/diagnostics/transit_bench/BUILD.gn
index 6473f85..c5db625 100644
--- a/src/diagnostics/transit_bench/BUILD.gn
+++ b/src/diagnostics/transit_bench/BUILD.gn
@@ -21,8 +21,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/developer/fuchsia-criterion",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/factory/factory_store_providers/BUILD.gn b/src/factory/factory_store_providers/BUILD.gn
index 5c51329..23be352 100644
--- a/src/factory/factory_store_providers/BUILD.gn
+++ b/src/factory/factory_store_providers/BUILD.gn
@@ -17,10 +17,10 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-bootfs",
"//sdk/fidl/fuchsia.factory:fuchsia.factory-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/pseudo-fs",
@@ -67,9 +67,9 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.factory:fuchsia.factory-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/fuchsia-vfs-watcher",
diff --git a/src/factory/factoryctl/BUILD.gn b/src/factory/factoryctl/BUILD.gn
index 2d7a040..491f0cf 100644
--- a/src/factory/factoryctl/BUILD.gn
+++ b/src/factory/factoryctl/BUILD.gn
@@ -16,9 +16,9 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.factory:fuchsia.factory-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/factory/fake_factory_items/BUILD.gn b/src/factory/fake_factory_items/BUILD.gn
index f3bf488..b471d19 100644
--- a/src/factory/fake_factory_items/BUILD.gn
+++ b/src/factory/fake_factory_items/BUILD.gn
@@ -13,7 +13,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/factory/fake_factory_store_providers/BUILD.gn b/src/factory/fake_factory_store_providers/BUILD.gn
index 28250b4..43b3629 100644
--- a/src/factory/fake_factory_store_providers/BUILD.gn
+++ b/src/factory/fake_factory_store_providers/BUILD.gn
@@ -15,9 +15,9 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.factory:fuchsia.factory-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/pseudo-fs",
@@ -70,8 +70,8 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.factory:fuchsia.factory-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/fonts/BUILD.gn b/src/fonts/BUILD.gn
index be3ba39..936400f 100644
--- a/src/fonts/BUILD.gn
+++ b/src/fonts/BUILD.gn
@@ -34,12 +34,12 @@
"manifest",
"//garnet/lib/rust/fidl_fuchsia_fonts_ext",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.fonts:fuchsia.fonts-rustc",
"//sdk/fidl/fuchsia.fonts.experimental:fuchsia.fonts.experimental-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
@@ -110,7 +110,6 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_fonts_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.fonts:fuchsia.fonts-rustc",
"//sdk/fidl/fuchsia.fonts.experimental:fuchsia.fonts.experimental-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
@@ -118,6 +117,7 @@
"//src/fonts/char_set",
"//src/fonts/manifest",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
@@ -235,9 +235,9 @@
edition = "2018"
source_root = "testing/mock_font_resolver.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/fonts/manifest/BUILD.gn b/src/fonts/manifest/BUILD.gn
index 0daa9ed..9c6901db 100644
--- a/src/fonts/manifest/BUILD.gn
+++ b/src/fonts/manifest/BUILD.gn
@@ -13,11 +13,11 @@
deps = [
"//garnet/lib/rust/fidl_fuchsia_fonts_ext",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.fonts:fuchsia.fonts-rustc",
"//src/fonts/char_set",
"//src/fonts/offset_string",
"//src/lib/error/clonable_error",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-url",
"//src/lib/intl/unicode_utils/char_collection",
"//third_party/rust_crates:anyhow",
diff --git a/src/hwinfo/BUILD.gn b/src/hwinfo/BUILD.gn
index 986531c..47e216d 100644
--- a/src/hwinfo/BUILD.gn
+++ b/src/hwinfo/BUILD.gn
@@ -16,11 +16,11 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.factory:fuchsia.factory-rustc",
"//sdk/fidl/fuchsia.hwinfo:fuchsia.hwinfo-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
@@ -97,9 +97,9 @@
source_root = "tests/hwinfo_positive_test.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.hwinfo:fuchsia.hwinfo-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
@@ -113,9 +113,9 @@
source_root = "tests/hwinfo_negative_test.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.hwinfo:fuchsia.hwinfo-rustc",
"//sdk/fidl/fuchsia.intl:fuchsia.intl-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/identity/bin/account_handler/BUILD.gn b/src/identity/bin/account_handler/BUILD.gn
index 4be3acc..c471e87 100644
--- a/src/identity/bin/account_handler/BUILD.gn
+++ b/src/identity/bin/account_handler/BUILD.gn
@@ -11,7 +11,6 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.account:fuchsia.identity.account-rustc",
"//sdk/fidl/fuchsia.identity.authentication:fuchsia.identity.authentication-rustc",
@@ -24,6 +23,7 @@
"//src/identity/lib/identity_common",
"//src/identity/lib/identity_key_manager",
"//src/identity/lib/token_manager",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/identity/bin/account_manager/BUILD.gn b/src/identity/bin/account_manager/BUILD.gn
index 4b7a90f..387e9a6 100644
--- a/src/identity/bin/account_manager/BUILD.gn
+++ b/src/identity/bin/account_manager/BUILD.gn
@@ -18,7 +18,6 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.account:fuchsia.identity.account-rustc",
"//sdk/fidl/fuchsia.overnet:fuchsia.overnet-rustc",
@@ -30,6 +29,7 @@
"//src/identity/fidl:account-transfer-rustc",
"//src/identity/lib/account_common",
"//src/identity/lib/token_manager",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/identity/bin/dev_auth_provider/BUILD.gn b/src/identity/bin/dev_auth_provider/BUILD.gn
index a8116f6..a68b769 100644
--- a/src/identity/bin/dev_auth_provider/BUILD.gn
+++ b/src/identity/bin/dev_auth_provider/BUILD.gn
@@ -11,10 +11,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.external:fuchsia.identity.external-rustc",
"//sdk/fidl/fuchsia.identity.tokens:fuchsia.identity.tokens-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/identity/bin/dev_authenticator/BUILD.gn b/src/identity/bin/dev_authenticator/BUILD.gn
index 606779c..86a7d59 100644
--- a/src/identity/bin/dev_authenticator/BUILD.gn
+++ b/src/identity/bin/dev_authenticator/BUILD.gn
@@ -11,9 +11,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.authentication:fuchsia.identity.authentication-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/identity/bin/google_auth_provider/BUILD.gn b/src/identity/bin/google_auth_provider/BUILD.gn
index 1fc0c5f..f54170c 100644
--- a/src/identity/bin/google_auth_provider/BUILD.gn
+++ b/src/identity/bin/google_auth_provider/BUILD.gn
@@ -11,7 +11,6 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.external:fuchsia.identity.external-rustc",
"//sdk/fidl/fuchsia.identity.tokens:fuchsia.identity.tokens-rustc",
@@ -19,6 +18,7 @@
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
"//sdk/fidl/fuchsia.web:fuchsia.web-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/identity/bin/token_manager_factory/BUILD.gn b/src/identity/bin/token_manager_factory/BUILD.gn
index bd2f7e7..3270390 100644
--- a/src/identity/bin/token_manager_factory/BUILD.gn
+++ b/src/identity/bin/token_manager_factory/BUILD.gn
@@ -10,11 +10,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.external:fuchsia.identity.external-rustc",
"//src/identity/lib/identity_common",
"//src/identity/lib/token_manager",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/identity/lib/account_common/BUILD.gn b/src/identity/lib/account_common/BUILD.gn
index 31f0242..35d6958 100644
--- a/src/identity/lib/account_common/BUILD.gn
+++ b/src/identity/lib/account_common/BUILD.gn
@@ -10,10 +10,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.account:fuchsia.identity.account-rustc",
"//src/identity/lib/identity_common",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:log",
"//third_party/rust_crates:serde",
diff --git a/src/identity/lib/identity_key_manager/BUILD.gn b/src/identity/lib/identity_key_manager/BUILD.gn
index 9f7659b..c146aa4 100644
--- a/src/identity/lib/identity_key_manager/BUILD.gn
+++ b/src/identity/lib/identity_key_manager/BUILD.gn
@@ -9,9 +9,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.identity.keys:fuchsia.identity.keys-rustc",
"//src/identity/lib/identity_common",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/test_util",
diff --git a/src/identity/lib/token_manager/BUILD.gn b/src/identity/lib/token_manager/BUILD.gn
index bc7104c..e81e573 100644
--- a/src/identity/lib/token_manager/BUILD.gn
+++ b/src/identity/lib/token_manager/BUILD.gn
@@ -9,13 +9,13 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.external:fuchsia.identity.external-rustc",
"//sdk/fidl/fuchsia.identity.tokens:fuchsia.identity.tokens-rustc",
"//src/identity/lib/identity_common",
"//src/identity/lib/token_cache",
"//src/identity/lib/token_store",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/identity/tests/account_manager_integration/BUILD.gn b/src/identity/tests/account_manager_integration/BUILD.gn
index ef427ea..f89a7e2 100644
--- a/src/identity/tests/account_manager_integration/BUILD.gn
+++ b/src/identity/tests/account_manager_integration/BUILD.gn
@@ -23,13 +23,13 @@
source_root = "tests/lib.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
"//sdk/fidl/fuchsia.identity.account:fuchsia.identity.account-rustc",
"//sdk/fidl/fuchsia.overnet.protocol:fuchsia.overnet.protocol-rustc",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
"//src/identity/fidl:account-prototype-rustc",
"//src/identity/lib/account_common",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/identity/tools/sktool/BUILD.gn b/src/identity/tools/sktool/BUILD.gn
index 4ca6b0b..7c18859 100644
--- a/src/identity/tools/sktool/BUILD.gn
+++ b/src/identity/tools/sktool/BUILD.gn
@@ -11,8 +11,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/lib/cobalt/rust/BUILD.gn b/src/lib/cobalt/rust/BUILD.gn
index f5aef41..30b1644 100644
--- a/src/lib/cobalt/rust/BUILD.gn
+++ b/src/lib/cobalt/rust/BUILD.gn
@@ -12,8 +12,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/cobalt/src/lib/client/rust:cobalt-client",
diff --git a/src/lib/fake-clock/svc/BUILD.gn b/src/lib/fake-clock/svc/BUILD.gn
index fcbdb52..4eb4177 100644
--- a/src/lib/fake-clock/svc/BUILD.gn
+++ b/src/lib/fake-clock/svc/BUILD.gn
@@ -12,8 +12,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fake-clock/fidl:fidl-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/lib/fidl/OWNERS b/src/lib/fidl/OWNERS
new file mode 100644
index 0000000..c58b4cc
--- /dev/null
+++ b/src/lib/fidl/OWNERS
@@ -0,0 +1,3 @@
+abarth@google.com
+cramertj@google.com
+pascallouis@google.com
diff --git a/garnet/public/lib/fidl/rust/OWNERS b/src/lib/fidl/rust/OWNERS
similarity index 100%
rename from garnet/public/lib/fidl/rust/OWNERS
rename to src/lib/fidl/rust/OWNERS
diff --git a/src/lib/fidl/rust/fidl/BUILD.gn b/src/lib/fidl/rust/fidl/BUILD.gn
new file mode 100644
index 0000000..b48017b
--- /dev/null
+++ b/src/lib/fidl/rust/fidl/BUILD.gn
@@ -0,0 +1,92 @@
+# Copyright 2017 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/fidl/fidl.gni")
+import("//build/fidl/wireformat.gni")
+import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
+import("//build/testing/environments.gni")
+
+rustc_library("fidl") {
+ with_unit_tests = true
+ edition = "2018"
+ deps = [
+ "//src/lib/zircon/rust:fuchsia-zircon-status",
+ "//third_party/rust_crates:anyhow",
+ "//third_party/rust_crates:bitflags",
+ "//third_party/rust_crates:byteorder",
+ "//third_party/rust_crates:futures",
+ "//third_party/rust_crates:parking_lot",
+ "//third_party/rust_crates:slab",
+ "//third_party/rust_crates:thiserror",
+ ]
+ if (is_fuchsia) {
+ deps += [
+ "//src/lib/fuchsia-async",
+ "//src/lib/syslog/rust:syslog",
+ "//src/lib/zircon/rust:fuchsia-zircon",
+ ]
+ } else {
+ deps += [
+ "//third_party/rust_crates:lazy_static",
+ "//third_party/rust_crates:slab",
+ ]
+ }
+ test_deps = [
+ "//src/lib/test_util",
+ "//third_party/rust_crates:futures-test",
+ "//third_party/rust_crates:matches",
+ ]
+ if (fidl_write_v1_wireformat) {
+ features = [ "fidl_write_v1" ]
+ }
+}
+
+# not actually used-- just to ensure successful compilation
+fidl("fidl.rust.test.compilation") {
+ sources = [ "compilation.test.fidl" ]
+}
+
+# not actually used-- just to ensure successful compilation
+# tests we can compose protocols from another FIDL crate
+fidl("fidl.rust.test.compilation.compose") {
+ sources = [ "compilation_compose.test.fidl" ]
+
+ public_deps = [ ":fidl.rust.test.compilation" ]
+}
+
+test_package("rust_fidl_tests") {
+ deps = [
+ ":fidl.rust.test.compilation-rustc",
+ ":fidl.rust.test.compilation-rustc($host_toolchain)",
+ ":fidl_test",
+ "//src/lib/fidl/rust/fidl_tests:fidl_conformance_tests",
+ "//src/lib/fidl/rust/fidl_tests:fidl_external_tests",
+ ]
+ tests = [
+ {
+ name = "fidl_lib_test"
+ dest = "fidl_tests"
+ environments = basic_envs
+ },
+ {
+ name = "fidl_external_tests"
+ dest = "fidl_external_tests"
+ environments = basic_envs
+ },
+ {
+ name = "fidl_conformance_tests"
+ dest = "fidl_conformance_tests"
+ environments = basic_envs
+ },
+ ]
+}
+
+group("tests") {
+ testonly = true
+ public_deps = [
+ ":fidl_test($host_toolchain)",
+ ":rust_fidl_tests",
+ ]
+}
diff --git a/garnet/public/lib/fidl/rust/fidl/compilation.test.fidl b/src/lib/fidl/rust/fidl/compilation.test.fidl
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/compilation.test.fidl
rename to src/lib/fidl/rust/fidl/compilation.test.fidl
diff --git a/garnet/public/lib/fidl/rust/fidl/compilation_compose.test.fidl b/src/lib/fidl/rust/fidl/compilation_compose.test.fidl
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/compilation_compose.test.fidl
rename to src/lib/fidl/rust/fidl/compilation_compose.test.fidl
diff --git a/garnet/public/lib/fidl/rust/fidl/meta/fidl_conformance_tests.cmx b/src/lib/fidl/rust/fidl/meta/fidl_conformance_tests.cmx
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/meta/fidl_conformance_tests.cmx
rename to src/lib/fidl/rust/fidl/meta/fidl_conformance_tests.cmx
diff --git a/garnet/public/lib/fidl/rust/fidl/meta/fidl_external_tests.cmx b/src/lib/fidl/rust/fidl/meta/fidl_external_tests.cmx
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/meta/fidl_external_tests.cmx
rename to src/lib/fidl/rust/fidl/meta/fidl_external_tests.cmx
diff --git a/garnet/public/lib/fidl/rust/fidl/meta/fidl_tests.cmx b/src/lib/fidl/rust/fidl/meta/fidl_tests.cmx
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/meta/fidl_tests.cmx
rename to src/lib/fidl/rust/fidl/meta/fidl_tests.cmx
diff --git a/garnet/public/lib/fidl/rust/fidl/src/client.rs b/src/lib/fidl/rust/fidl/src/client.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/client.rs
rename to src/lib/fidl/rust/fidl/src/client.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/encoding.rs b/src/lib/fidl/rust/fidl/src/encoding.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/encoding.rs
rename to src/lib/fidl/rust/fidl/src/encoding.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/endpoints.rs b/src/lib/fidl/rust/fidl/src/endpoints.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/endpoints.rs
rename to src/lib/fidl/rust/fidl/src/endpoints.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/epitaph.rs b/src/lib/fidl/rust/fidl/src/epitaph.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/epitaph.rs
rename to src/lib/fidl/rust/fidl/src/epitaph.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/error.rs b/src/lib/fidl/rust/fidl/src/error.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/error.rs
rename to src/lib/fidl/rust/fidl/src/error.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/handle.rs b/src/lib/fidl/rust/fidl/src/handle.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/handle.rs
rename to src/lib/fidl/rust/fidl/src/handle.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/lib.rs b/src/lib/fidl/rust/fidl/src/lib.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/lib.rs
rename to src/lib/fidl/rust/fidl/src/lib.rs
diff --git a/garnet/public/lib/fidl/rust/fidl/src/server.rs b/src/lib/fidl/rust/fidl/src/server.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl/src/server.rs
rename to src/lib/fidl/rust/fidl/src/server.rs
diff --git a/garnet/public/lib/fidl/rust/fidl_tests/BUILD.gn b/src/lib/fidl/rust/fidl_tests/BUILD.gn
similarity index 91%
rename from garnet/public/lib/fidl/rust/fidl_tests/BUILD.gn
rename to src/lib/fidl/rust/fidl_tests/BUILD.gn
index b5dc9d0..54bc5b8 100644
--- a/garnet/public/lib/fidl/rust/fidl_tests/BUILD.gn
+++ b/src/lib/fidl/rust/fidl_tests/BUILD.gn
@@ -10,7 +10,7 @@
edition = "2018"
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
]
}
@@ -29,7 +29,7 @@
edition = "2018"
source_root = conformance_test_source
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//tools/fidl/gidl-conformance-suite:conformance_fidl-rustc",
]
diff --git a/garnet/public/lib/fidl/rust/fidl_tests/src/lib.rs b/src/lib/fidl/rust/fidl_tests/src/lib.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl_tests/src/lib.rs
rename to src/lib/fidl/rust/fidl_tests/src/lib.rs
diff --git a/garnet/public/lib/fidl/rust/fidl_tests/src/server_sender.rs b/src/lib/fidl/rust/fidl_tests/src/server_sender.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl_tests/src/server_sender.rs
rename to src/lib/fidl/rust/fidl_tests/src/server_sender.rs
diff --git a/garnet/public/lib/fidl/rust/fidl_tests/src/stream_handler_test.rs b/src/lib/fidl/rust/fidl_tests/src/stream_handler_test.rs
similarity index 100%
rename from garnet/public/lib/fidl/rust/fidl_tests/src/stream_handler_test.rs
rename to src/lib/fidl/rust/fidl_tests/src/stream_handler_test.rs
diff --git a/src/lib/fuchsia-component/BUILD.gn b/src/lib/fuchsia-component/BUILD.gn
index 3328ea6..a5f39d9 100644
--- a/src/lib/fuchsia-component/BUILD.gn
+++ b/src/lib/fuchsia-component/BUILD.gn
@@ -12,9 +12,9 @@
edition = "2018"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -37,7 +37,7 @@
":fuchsia.component.test-rustc",
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/storage/pseudo-fs",
"//src/lib/test_util",
diff --git a/src/lib/fuchsia-component/isolated_component_test/BUILD.gn b/src/lib/fuchsia-component/isolated_component_test/BUILD.gn
index f492d85..cfe8fae 100644
--- a/src/lib/fuchsia-component/isolated_component_test/BUILD.gn
+++ b/src/lib/fuchsia-component/isolated_component_test/BUILD.gn
@@ -18,8 +18,8 @@
edition = "2018"
deps = [
":echos-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
@@ -45,9 +45,9 @@
edition = "2018"
deps = [
":echos-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
@@ -76,9 +76,9 @@
edition = "2018"
deps = [
":echos-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
@@ -106,7 +106,7 @@
edition = "2018"
deps = [
":echos-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/lib/inspect/rust/fuchsia-inspect/BUILD.gn b/src/lib/inspect/rust/fuchsia-inspect/BUILD.gn
index 2e187fc..35ea3f0 100644
--- a/src/lib/inspect/rust/fuchsia-inspect/BUILD.gn
+++ b/src/lib/inspect/rust/fuchsia-inspect/BUILD.gn
@@ -12,9 +12,9 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect-node-hierarchy",
diff --git a/src/lib/process_builder/BUILD.gn b/src/lib/process_builder/BUILD.gn
index a256012..526a787 100644
--- a/src/lib/process_builder/BUILD.gn
+++ b/src/lib/process_builder/BUILD.gn
@@ -13,7 +13,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/zerocopy",
@@ -57,8 +57,8 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -85,7 +85,7 @@
deps = [
":test-util-fidl-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/lib/storage/fuchsia-vfs-watcher/BUILD.gn b/src/lib/storage/fuchsia-vfs-watcher/BUILD.gn
index a7871e3..18cccc2 100644
--- a/src/lib/storage/fuchsia-vfs-watcher/BUILD.gn
+++ b/src/lib/storage/fuchsia-vfs-watcher/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/lib/storage/pseudo-fs-mt/BUILD.gn b/src/lib/storage/pseudo-fs-mt/BUILD.gn
index 5826f8e..039526d 100644
--- a/src/lib/storage/pseudo-fs-mt/BUILD.gn
+++ b/src/lib/storage/pseudo-fs-mt/BUILD.gn
@@ -11,7 +11,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/storage/pseudo-fs-mt/macros",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/lib/storage/pseudo-fs/BUILD.gn b/src/lib/storage/pseudo-fs/BUILD.gn
index 3c1a38b..1d508d7 100644
--- a/src/lib/storage/pseudo-fs/BUILD.gn
+++ b/src/lib/storage/pseudo-fs/BUILD.gn
@@ -11,7 +11,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/storage/pseudo-fs/macros",
"//third_party/rust_crates:anyhow",
diff --git a/src/lib/syslog/rust/BUILD.gn b/src/lib/syslog/rust/BUILD.gn
index 6a57160..2c84345 100644
--- a/src/lib/syslog/rust/BUILD.gn
+++ b/src/lib/syslog/rust/BUILD.gn
@@ -28,7 +28,7 @@
source_root = "syslog-listener/src/lib.rs"
deps = [
":syslog",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/lib/test_executor/rust/BUILD.gn b/src/lib/test_executor/rust/BUILD.gn
index 0106546..da7a768 100644
--- a/src/lib/test_executor/rust/BUILD.gn
+++ b/src/lib/test_executor/rust/BUILD.gn
@@ -10,9 +10,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/lib/ui/carnelian/BUILD.gn b/src/lib/ui/carnelian/BUILD.gn
index bd48776..b526f45 100644
--- a/src/lib/ui/carnelian/BUILD.gn
+++ b/src/lib/ui/carnelian/BUILD.gn
@@ -15,7 +15,6 @@
edition = "2018"
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.fonts:fuchsia.fonts-rustc",
"//sdk/fidl/fuchsia.images:fuchsia.images-rustc",
"//sdk/fidl/fuchsia.input.report:fuchsia.input.report-rustc",
@@ -30,6 +29,7 @@
"//src/graphics/lib/compute/spinel-mold",
"//src/graphics/lib/compute/spinel-rs-sys",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mapped-vmo",
@@ -59,8 +59,8 @@
source_root = "examples/spinning_square.rs"
deps = [
"//garnet/examples/fidl/services:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/ui/carnelian",
"//src/lib/ui/fuchsia-scenic",
@@ -76,10 +76,10 @@
edition = "2018"
source_root = "examples/embedding.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.math:fuchsia.math-rustc",
"//sdk/fidl/fuchsia.ui.app:fuchsia.ui.app-rustc",
"//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/ui/carnelian",
@@ -217,11 +217,11 @@
edition = "2018"
source_root = "examples/clockface.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/graphics/lib/compute/mold",
"//src/graphics/lib/compute/spinel-mold",
"//src/graphics/lib/compute/spinel-rs-sys",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mapped-vmo",
@@ -260,13 +260,13 @@
edition = "2018"
source_root = "examples/ink.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.input.report:fuchsia.input.report-rustc",
"//src/graphics/lib/compute/mold",
"//src/graphics/lib/compute/spinel-mold",
"//src/graphics/lib/compute/spinel-rs-sys",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mapped-vmo",
@@ -306,7 +306,6 @@
edition = "2018"
source_root = "examples/infinite_scroll.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.fonts:fuchsia.fonts-rustc",
"//sdk/fidl/fuchsia.input.report:fuchsia.input.report-rustc",
"//src/graphics/lib/compute/mold",
@@ -314,6 +313,7 @@
"//src/graphics/lib/compute/spinel-rs-sys",
"//src/lib/argh",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mapped-vmo",
diff --git a/src/lib/ui/fuchsia-framebuffer/BUILD.gn b/src/lib/ui/fuchsia-framebuffer/BUILD.gn
index 3b50b28..6d2a526 100644
--- a/src/lib/ui/fuchsia-framebuffer/BUILD.gn
+++ b/src/lib/ui/fuchsia-framebuffer/BUILD.gn
@@ -12,8 +12,8 @@
version = "0.1.0"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/lib/ui/fuchsia-scenic/BUILD.gn b/src/lib/ui/fuchsia-scenic/BUILD.gn
index 422a6e7..2258eda 100644
--- a/src/lib/ui/fuchsia-scenic/BUILD.gn
+++ b/src/lib/ui/fuchsia-scenic/BUILD.gn
@@ -12,12 +12,12 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.images:fuchsia.images-rustc",
"//sdk/fidl/fuchsia.math:fuchsia.math-rustc",
"//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
"//sdk/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/mapped-vmo",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/lib/ui/input-synthesis/BUILD.gn b/src/lib/ui/input-synthesis/BUILD.gn
index 7d8448ed..e226d97 100644
--- a/src/lib/ui/input-synthesis/BUILD.gn
+++ b/src/lib/ui/input-synthesis/BUILD.gn
@@ -11,9 +11,9 @@
version = "0.1.0"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/media/audio/audio_core/test/device/BUILD.gn b/src/media/audio/audio_core/test/device/BUILD.gn
index 26e8a52..96631fa 100644
--- a/src/media/audio/audio_core/test/device/BUILD.gn
+++ b/src/media/audio/audio_core/test/device/BUILD.gn
@@ -9,9 +9,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.virtualaudio:fuchsia.virtualaudio-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/test_util",
"//src/media/audio/lib/test/hermetic_audio_environment/rust",
diff --git a/src/media/audio/lib/test/hermetic_audio_environment/rust/BUILD.gn b/src/media/audio/lib/test/hermetic_audio_environment/rust/BUILD.gn
index 9e0d688..f038598 100644
--- a/src/media/audio/lib/test/hermetic_audio_environment/rust/BUILD.gn
+++ b/src/media/audio/lib/test/hermetic_audio_environment/rust/BUILD.gn
@@ -10,10 +10,10 @@
testonly = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.virtualaudio:fuchsia.virtualaudio-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/test_util",
diff --git a/src/media/sessions/BUILD.gn b/src/media/sessions/BUILD.gn
index 6a135c5..9e7aa05 100644
--- a/src/media/sessions/BUILD.gn
+++ b/src/media/sessions/BUILD.gn
@@ -30,10 +30,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.math:fuchsia.math-rustc",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.media.sessions2:fuchsia.media.sessions2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
diff --git a/src/media/sessions/examples/BUILD.gn b/src/media/sessions/examples/BUILD.gn
index 752e7a3..4284417 100644
--- a/src/media/sessions/examples/BUILD.gn
+++ b/src/media/sessions/examples/BUILD.gn
@@ -16,9 +16,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.media.sessions2:fuchsia.media.sessions2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/media/sessions/mediasession_cli_tool/BUILD.gn b/src/media/sessions/mediasession_cli_tool/BUILD.gn
index 76598ea..640157d 100644
--- a/src/media/sessions/mediasession_cli_tool/BUILD.gn
+++ b/src/media/sessions/mediasession_cli_tool/BUILD.gn
@@ -11,10 +11,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.media.sessions2:fuchsia.media.sessions2-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/media/sounds/example/BUILD.gn b/src/media/sounds/example/BUILD.gn
index 6a65511..3eb7474 100644
--- a/src/media/sounds/example/BUILD.gn
+++ b/src/media/sounds/example/BUILD.gn
@@ -41,10 +41,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.media.sounds:fuchsia.media.sounds-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
diff --git a/src/media/sounds/soundplayer/BUILD.gn b/src/media/sounds/soundplayer/BUILD.gn
index e84f7a8..ed6d5f6 100644
--- a/src/media/sounds/soundplayer/BUILD.gn
+++ b/src/media/sounds/soundplayer/BUILD.gn
@@ -27,10 +27,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.media.sounds:fuchsia.media.sounds-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/media/stream_processors/fuchsia-stream-processors/BUILD.gn b/src/media/stream_processors/fuchsia-stream-processors/BUILD.gn
index c0cd7f5..645880d 100644
--- a/src/media/stream_processors/fuchsia-stream-processors/BUILD.gn
+++ b/src/media/stream_processors/fuchsia-stream-processors/BUILD.gn
@@ -14,10 +14,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.mediacodec:fuchsia.mediacodec-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/media/stream_processors/test/BUILD.gn b/src/media/stream_processors/test/BUILD.gn
index aa214e9..c2399d4 100644
--- a/src/media/stream_processors/test/BUILD.gn
+++ b/src/media/stream_processors/test/BUILD.gn
@@ -27,9 +27,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.mediacodec:fuchsia.mediacodec-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fidl_table_validation",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
@@ -65,9 +65,9 @@
deps = [
":stream_processor_test_lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.mediacodec:fuchsia.mediacodec-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
@@ -83,9 +83,9 @@
deps = [
":stream_processor_test_lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
"//sdk/fidl/fuchsia.mediacodec:fuchsia.mediacodec-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:futures",
@@ -101,8 +101,8 @@
deps = [
":stream_processor_decoder_factory_lib",
":stream_processor_test_lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/mundane",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -144,8 +144,8 @@
deps = [
":stream_processor_encoder_factory_lib",
":stream_processor_test_lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/mundane",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -180,8 +180,8 @@
deps = [
":stream_processor_test_lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/mundane",
"//src/media/stream_processors/fuchsia-stream-processors",
"//third_party/rust_crates:anyhow",
@@ -212,8 +212,8 @@
":stream_processor_decoder_factory_lib",
":stream_processor_test_lib",
":video_frame_hasher_lib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.media:fuchsia.media-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//third_party/rust_crates:anyhow",
diff --git a/src/modular/bin/module_resolver_rs/BUILD.gn b/src/modular/bin/module_resolver_rs/BUILD.gn
index d000f89..273c2df 100644
--- a/src/modular/bin/module_resolver_rs/BUILD.gn
+++ b/src/modular/bin/module_resolver_rs/BUILD.gn
@@ -12,8 +12,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.modular:fuchsia.modular-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/security/kms/BUILD.gn b/src/security/kms/BUILD.gn
index 346f386..ba8fdcb 100644
--- a/src/security/kms/BUILD.gn
+++ b/src/security/kms/BUILD.gn
@@ -14,8 +14,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.kms:fuchsia.kms-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mundane:mundane",
diff --git a/src/security/kms_test_client/BUILD.gn b/src/security/kms_test_client/BUILD.gn
index d7b7212..98cda9e 100644
--- a/src/security/kms_test_client/BUILD.gn
+++ b/src/security/kms_test_client/BUILD.gn
@@ -12,8 +12,8 @@
edition = "2018"
source_root = "src/main.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.kms:fuchsia.kms-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mundane:mundane",
diff --git a/src/session/bin/component_manager/BUILD.gn b/src/session/bin/component_manager/BUILD.gn
index 77a5bf6..50db656 100644
--- a/src/session/bin/component_manager/BUILD.gn
+++ b/src/session/bin/component_manager/BUILD.gn
@@ -11,10 +11,10 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.session:fuchsia.session-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/session/bin/session_manager/BUILD.gn b/src/session/bin/session_manager/BUILD.gn
index 75fea12..7149f38 100644
--- a/src/session/bin/session_manager/BUILD.gn
+++ b/src/session/bin/session_manager/BUILD.gn
@@ -30,10 +30,10 @@
deps = [
":session_framework_metrics_registry_rustlib",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.session:fuchsia.session-rustc",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/session/examples/elements/element_proposer/BUILD.gn b/src/session/examples/elements/element_proposer/BUILD.gn
index ef8c38d..0d12be5 100644
--- a/src/session/examples/elements/element_proposer/BUILD.gn
+++ b/src/session/examples/elements/element_proposer/BUILD.gn
@@ -19,8 +19,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.session:fuchsia.session-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/session/examples/elements/element_session/BUILD.gn b/src/session/examples/elements/element_session/BUILD.gn
index 1f6cfac..867d319 100644
--- a/src/session/examples/elements/element_session/BUILD.gn
+++ b/src/session/examples/elements/element_session/BUILD.gn
@@ -19,9 +19,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.session:fuchsia.session-rustc",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/session/fidl:session_examples-rustc",
diff --git a/src/session/examples/elements/simple_element/BUILD.gn b/src/session/examples/elements/simple_element/BUILD.gn
index a402623..10ea36d 100644
--- a/src/session/examples/elements/simple_element/BUILD.gn
+++ b/src/session/examples/elements/simple_element/BUILD.gn
@@ -19,7 +19,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/session/fidl:session_examples-rustc",
diff --git a/src/session/examples/graphical_session/BUILD.gn b/src/session/examples/graphical_session/BUILD.gn
index eb0e63a..1960b85 100644
--- a/src/session/examples/graphical_session/BUILD.gn
+++ b/src/session/examples/graphical_session/BUILD.gn
@@ -26,10 +26,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.images:fuchsia.images-rustc",
"//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
"//sdk/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/session/lib/element_management/BUILD.gn b/src/session/lib/element_management/BUILD.gn
index eda23ee..2ead9ff 100644
--- a/src/session/lib/element_management/BUILD.gn
+++ b/src/session/lib/element_management/BUILD.gn
@@ -11,10 +11,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.session:fuchsia.session-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/session/lib/input/BUILD.gn b/src/session/lib/input/BUILD.gn
index c28d7ca..0897343 100644
--- a/src/session/lib/input/BUILD.gn
+++ b/src/session/lib/input/BUILD.gn
@@ -11,13 +11,13 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-scenic",
"//sdk/fidl/fuchsia.input.report:fuchsia.input.report-rustc",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//src/graphics/lib/compute/mold",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/ui/input-synthesis",
diff --git a/src/session/lib/realm_management/BUILD.gn b/src/session/lib/realm_management/BUILD.gn
index 170649d..2ead92b 100644
--- a/src/session/lib/realm_management/BUILD.gn
+++ b/src/session/lib/realm_management/BUILD.gn
@@ -11,8 +11,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/session/lib/scene_management/BUILD.gn b/src/session/lib/scene_management/BUILD.gn
index 2311868..ecf6b3f 100644
--- a/src/session/lib/scene_management/BUILD.gn
+++ b/src/session/lib/scene_management/BUILD.gn
@@ -11,13 +11,13 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.ui.app:fuchsia.ui.app-rustc",
"//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
"//sdk/fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
"//sdk/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/session/tools/session_control/BUILD.gn b/src/session/tools/session_control/BUILD.gn
index d8b0993..b474e24 100644
--- a/src/session/tools/session_control/BUILD.gn
+++ b/src/session/tools/session_control/BUILD.gn
@@ -12,9 +12,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.session:fuchsia.session-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/storage/ext4/read-only/BUILD.gn b/src/storage/ext4/read-only/BUILD.gn
index 16b5487..e4cbbf5 100644
--- a/src/storage/ext4/read-only/BUILD.gn
+++ b/src/storage/ext4/read-only/BUILD.gn
@@ -14,7 +14,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/storage/pseudo-fs-mt",
"//src/lib/storage/pseudo-fs-mt/macros",
"//src/lib/zerocopy",
diff --git a/src/storage/ext4/server/BUILD.gn b/src/storage/ext4/server/BUILD.gn
index 9130511..86d3a31 100644
--- a/src/storage/ext4/server/BUILD.gn
+++ b/src/storage/ext4/server/BUILD.gn
@@ -15,7 +15,7 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/storage/pseudo-fs-mt",
@@ -36,7 +36,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/test_util",
diff --git a/src/storage/fs-management/BUILD.gn b/src/storage/fs-management/BUILD.gn
index fce3b07..586b4ce 100644
--- a/src/storage/fs-management/BUILD.gn
+++ b/src/storage/fs-management/BUILD.gn
@@ -9,9 +9,9 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/cstr",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-runtime",
"//src/lib/zircon/rust:fuchsia-zircon",
"//src/storage/ramdevice-client",
diff --git a/src/stories/bin/discovermgr/BUILD.gn b/src/stories/bin/discovermgr/BUILD.gn
index 3c12ea0..a277d29 100644
--- a/src/stories/bin/discovermgr/BUILD.gn
+++ b/src/stories/bin/discovermgr/BUILD.gn
@@ -14,13 +14,13 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.app.discover:fuchsia.app.discover-rustc",
"//sdk/fidl/fuchsia.devicesettings:fuchsia.devicesettings-rustc",
"//sdk/fidl/fuchsia.modular:fuchsia.modular-rustc",
"//sdk/fidl/fuchsia.net.oldhttp:fuchsia.net.oldhttp-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/ledger/fidl/fuchsia.ledger:fuchsia.ledger-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/appmgr/integration_tests/component_events/BUILD.gn b/src/sys/appmgr/integration_tests/component_events/BUILD.gn
index 5aca256..f904237 100644
--- a/src/sys/appmgr/integration_tests/component_events/BUILD.gn
+++ b/src/sys/appmgr/integration_tests/component_events/BUILD.gn
@@ -46,8 +46,8 @@
deps = [
"//garnet/lib/rust/files_async",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys.internal:fuchsia.sys.internal-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/sys/appmgr/integration_tests/logs/BUILD.gn b/src/sys/appmgr/integration_tests/logs/BUILD.gn
index 7d46b32..2dbd3a7 100644
--- a/src/sys/appmgr/integration_tests/logs/BUILD.gn
+++ b/src/sys/appmgr/integration_tests/logs/BUILD.gn
@@ -44,9 +44,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/diagnostics/lib/validating-log-listener",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:futures",
diff --git a/src/sys/appmgr/integration_tests/outdir/BUILD.gn b/src/sys/appmgr/integration_tests/outdir/BUILD.gn
index 2eb9784..9310731 100644
--- a/src/sys/appmgr/integration_tests/outdir/BUILD.gn
+++ b/src/sys/appmgr/integration_tests/outdir/BUILD.gn
@@ -19,8 +19,8 @@
deps = [
"//garnet/examples/fidl/services:echo-rustc",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/storage/pseudo-fs-mt",
diff --git a/src/sys/component_index/BUILD.gn b/src/sys/component_index/BUILD.gn
index 54186bc..bc12bbe 100644
--- a/src/sys/component_index/BUILD.gn
+++ b/src/sys/component_index/BUILD.gn
@@ -44,7 +44,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/component_manager/BUILD.gn b/src/sys/component_manager/BUILD.gn
index 9cc0e6a6..0c202387 100644
--- a/src/sys/component_manager/BUILD.gn
+++ b/src/sys/component_manager/BUILD.gn
@@ -25,13 +25,13 @@
"//garnet/lib/rust/cm_fidl_validator",
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.data:fuchsia.data-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
"//src/lib/by_addr:by_addr",
"//src/lib/error/clonable_error",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
@@ -104,7 +104,7 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/storage/pseudo-fs",
diff --git a/src/sys/component_manager/tests/BUILD.gn b/src/sys/component_manager/tests/BUILD.gn
index a01cacc..8af6f9e 100644
--- a/src/sys/component_manager/tests/BUILD.gn
+++ b/src/sys/component_manager/tests/BUILD.gn
@@ -31,7 +31,7 @@
edition = "2018"
source_root = "breakpoint_system_client.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/sys/component_manager/tests/fidl:breakpoints-rustc",
@@ -46,7 +46,7 @@
edition = "2018"
source_root = "trigger_capability.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/sys/component_manager/tests:breakpoint_system_client",
@@ -64,7 +64,7 @@
deps = [
":breakpoint_system_client",
"//examples/components/routing/fidl:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
@@ -80,9 +80,9 @@
deps = [
":breakpoint_system_client",
"//garnet/lib/rust/files_async",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/component_manager/tests/base_resolver_test/BUILD.gn b/src/sys/component_manager/tests/base_resolver_test/BUILD.gn
index ae8c94c..bcc4736 100644
--- a/src/sys/component_manager/tests/base_resolver_test/BUILD.gn
+++ b/src/sys/component_manager/tests/base_resolver_test/BUILD.gn
@@ -29,8 +29,8 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/component_manager/tests/breakpoints_system/BUILD.gn b/src/sys/component_manager/tests/breakpoints_system/BUILD.gn
index 913339a..be7643f 100644
--- a/src/sys/component_manager/tests/breakpoints_system/BUILD.gn
+++ b/src/sys/component_manager/tests/breakpoints_system/BUILD.gn
@@ -12,7 +12,7 @@
source_root = "integration_test.rs"
deps = [
"//examples/components/routing/fidl:echo-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/sys/component_manager/tests:breakpoint_system_client",
"//src/sys/component_manager/tests:echo_capability",
diff --git a/src/sys/component_manager/tests/collections/BUILD.gn b/src/sys/component_manager/tests/collections/BUILD.gn
index a50e7ef..f638e05 100644
--- a/src/sys/component_manager/tests/collections/BUILD.gn
+++ b/src/sys/component_manager/tests/collections/BUILD.gn
@@ -23,8 +23,8 @@
source_root = "collection_realm.rs"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/component_manager/tests/destruction/BUILD.gn b/src/sys/component_manager/tests/destruction/BUILD.gn
index 3592cad..6277216 100644
--- a/src/sys/component_manager/tests/destruction/BUILD.gn
+++ b/src/sys/component_manager/tests/destruction/BUILD.gn
@@ -25,8 +25,8 @@
source_root = "collection_realm.rs"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/component_manager/tests/hub/BUILD.gn b/src/sys/component_manager/tests/hub/BUILD.gn
index bf2c7be..e06b7e0 100644
--- a/src/sys/component_manager/tests/hub/BUILD.gn
+++ b/src/sys/component_manager/tests/hub/BUILD.gn
@@ -11,7 +11,7 @@
edition = "2018"
source_root = "hub_report_capability.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/sys/component_manager/tests:breakpoint_system_client",
"//src/sys/component_manager/tests/fidl:breakpoints-rustc",
diff --git a/src/sys/component_manager/tests/hub/components/BUILD.gn b/src/sys/component_manager/tests/hub/components/BUILD.gn
index 75658dd..e37b300 100644
--- a/src/sys/component_manager/tests/hub/components/BUILD.gn
+++ b/src/sys/component_manager/tests/hub/components/BUILD.gn
@@ -45,8 +45,8 @@
":hub_report_lib",
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/sys/component_manager/tests:breakpoint_system_client",
@@ -65,7 +65,7 @@
":hub_report_lib",
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
@@ -81,8 +81,8 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/sys/component_manager/tests/fidl:hub-rustc",
diff --git a/src/sys/component_manager/tests/rights/BUILD.gn b/src/sys/component_manager/tests/rights/BUILD.gn
index 04e281c..bdc9f46 100644
--- a/src/sys/component_manager/tests/rights/BUILD.gn
+++ b/src/sys/component_manager/tests/rights/BUILD.gn
@@ -46,8 +46,8 @@
source_root = "use_dir_rights.rs"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//zircon/system/fidl/fuchsia-io:fuchsia-io-rustc",
@@ -59,8 +59,8 @@
source_root = "use_storage.rs"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
diff --git a/src/sys/component_manager/tests/storage/BUILD.gn b/src/sys/component_manager/tests/storage/BUILD.gn
index b92d816a..4bfe8aa 100644
--- a/src/sys/component_manager/tests/storage/BUILD.gn
+++ b/src/sys/component_manager/tests/storage/BUILD.gn
@@ -12,8 +12,8 @@
source_root = "integration_test.rs"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/syslog/rust:syslog",
"//src/lib/zircon/rust:fuchsia-zircon",
@@ -34,8 +34,8 @@
edition = "2018"
source_root = "storage_realm_coll.rs"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/sys/component_manager/tests/fidl:components-rustc",
@@ -50,7 +50,7 @@
source_root = "storage_user.rs"
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/storage/pseudo-fs-mt",
diff --git a/src/sys/component_manager/tests/work_scheduler/BUILD.gn b/src/sys/component_manager/tests/work_scheduler/BUILD.gn
index 080af11..65c6c76 100644
--- a/src/sys/component_manager/tests/work_scheduler/BUILD.gn
+++ b/src/sys/component_manager/tests/work_scheduler/BUILD.gn
@@ -13,7 +13,7 @@
source_root = "work_scheduler_dispatch_reporter.rs"
deps = [
"//garnet/lib/rust/cm_rust",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/zircon/rust:fuchsia-zircon",
"//src/sys/component_manager:lib",
@@ -31,8 +31,8 @@
source_root = "//src/sys/component_manager/tests/work_scheduler/work_scheduler_integration_test.rs"
deps = [
":work_scheduler_dispatch_reporter",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/sys/component_manager:lib",
"//src/sys/component_manager/tests:test_utils",
diff --git a/src/sys/component_manager_for_test/BUILD.gn b/src/sys/component_manager_for_test/BUILD.gn
index c09bea3..fe072de 100644
--- a/src/sys/component_manager_for_test/BUILD.gn
+++ b/src/sys/component_manager_for_test/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/component_test_runner/BUILD.gn b/src/sys/component_test_runner/BUILD.gn
index ac21edc..27988d0 100644
--- a/src/sys/component_test_runner/BUILD.gn
+++ b/src/sys/component_test_runner/BUILD.gn
@@ -14,8 +14,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/device_settings/BUILD.gn b/src/sys/device_settings/BUILD.gn
index 3149cde..f8081c0 100644
--- a/src/sys/device_settings/BUILD.gn
+++ b/src/sys/device_settings/BUILD.gn
@@ -22,9 +22,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.devicesettings:fuchsia.devicesettings-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/gtest_v1_runner/BUILD.gn b/src/sys/gtest_v1_runner/BUILD.gn
index 94552c1..503a69d 100644
--- a/src/sys/gtest_v1_runner/BUILD.gn
+++ b/src/sys/gtest_v1_runner/BUILD.gn
@@ -13,10 +13,10 @@
deps = [
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/by_addr:by_addr",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/lib/directory_broker/BUILD.gn b/src/sys/lib/directory_broker/BUILD.gn
index 63d1673..1727597 100644
--- a/src/sys/lib/directory_broker/BUILD.gn
+++ b/src/sys/lib/directory_broker/BUILD.gn
@@ -13,7 +13,7 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/storage/pseudo-fs-mt",
"//third_party/rust_crates:futures",
"//third_party/rust_crates:parking_lot",
diff --git a/src/sys/lib/library_loader/BUILD.gn b/src/sys/lib/library_loader/BUILD.gn
index 180c39f..af5aa07 100644
--- a/src/sys/lib/library_loader/BUILD.gn
+++ b/src/sys/lib/library_loader/BUILD.gn
@@ -15,7 +15,7 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/storage/pseudo-fs",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/locate/BUILD.gn b/src/sys/locate/BUILD.gn
index 5c1e291..f65cd9f 100644
--- a/src/sys/locate/BUILD.gn
+++ b/src/sys/locate/BUILD.gn
@@ -12,7 +12,7 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/pkg/bin/fake-channel-control/BUILD.gn b/src/sys/pkg/bin/fake-channel-control/BUILD.gn
index f96d3c4..347e96e 100644
--- a/src/sys/pkg/bin/fake-channel-control/BUILD.gn
+++ b/src/sys/pkg/bin/fake-channel-control/BUILD.gn
@@ -9,8 +9,8 @@
name = "fake-channel-control"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.update.channelcontrol:fuchsia.update.channelcontrol-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/sys/pkg/bin/omaha-client/BUILD.gn b/src/sys/pkg/bin/omaha-client/BUILD.gn
index ecfd44f7..0ea38155 100644
--- a/src/sys/pkg/bin/omaha-client/BUILD.gn
+++ b/src/sys/pkg/bin/omaha-client/BUILD.gn
@@ -24,13 +24,13 @@
deps = [
":mos_metrics_registry_rustlib",
"//garnet/lib/rust/sysconfig-client",
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-hyper",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.update:fuchsia.update-rustc",
"//sdk/fidl/fuchsia.update.channelcontrol:fuchsia.update.channelcontrol-rustc",
"//src/lib/cobalt/rust:fuchsia-cobalt",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/pkg/bin/pkg-cache/BUILD.gn b/src/sys/pkg/bin/pkg-cache/BUILD.gn
index 5080f13..fd95dd1 100644
--- a/src/sys/pkg/bin/pkg-cache/BUILD.gn
+++ b/src/sys/pkg/bin/pkg-cache/BUILD.gn
@@ -15,10 +15,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.space:fuchsia.space-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/pkg/bin/pkg-resolver/BUILD.gn b/src/sys/pkg/bin/pkg-resolver/BUILD.gn
index fac77c2..290c8f3 100644
--- a/src/sys/pkg/bin/pkg-resolver/BUILD.gn
+++ b/src/sys/pkg/bin/pkg-resolver/BUILD.gn
@@ -19,12 +19,12 @@
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
"//garnet/lib/rust/sysconfig-client",
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-hyper",
"//sdk/fidl/fuchsia.amber:fuchsia.amber-rustc",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.pkg.rewrite:fuchsia.pkg.rewrite-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/pkg/bin/pkgctl/BUILD.gn b/src/sys/pkg/bin/pkgctl/BUILD.gn
index 67d1ff2..8f466e8 100644
--- a/src/sys/pkg/bin/pkgctl/BUILD.gn
+++ b/src/sys/pkg/bin/pkgctl/BUILD.gn
@@ -14,12 +14,12 @@
deps = [
"//garnet/lib/rust/files_async",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.pkg.rewrite:fuchsia.pkg.rewrite-rustc",
"//sdk/fidl/fuchsia.space:fuchsia.space-rustc",
"//sdk/fidl/fuchsia.update:fuchsia.update-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/pkg/bin/system-update-checker/BUILD.gn b/src/sys/pkg/bin/system-update-checker/BUILD.gn
index 5402fa7e..0251a9f 100644
--- a/src/sys/pkg/bin/system-update-checker/BUILD.gn
+++ b/src/sys/pkg/bin/system-update-checker/BUILD.gn
@@ -14,7 +14,6 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.pkg.rewrite:fuchsia.pkg.rewrite-rustc",
"//sdk/fidl/fuchsia.recovery:fuchsia.recovery-rustc",
@@ -22,6 +21,7 @@
"//sdk/fidl/fuchsia.update:fuchsia.update-rustc",
"//sdk/fidl/fuchsia.update.channel:fuchsia.update.channel-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/pkg/bin/update/BUILD.gn b/src/sys/pkg/bin/update/BUILD.gn
index f364e0b..03b87a8 100644
--- a/src/sys/pkg/bin/update/BUILD.gn
+++ b/src/sys/pkg/bin/update/BUILD.gn
@@ -11,10 +11,10 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.update:fuchsia.update-rustc",
"//sdk/fidl/fuchsia.update.channelcontrol:fuchsia.update.channelcontrol-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//third_party/rust_crates:anyhow",
diff --git a/src/sys/pkg/lib/event-queue/BUILD.gn b/src/sys/pkg/lib/event-queue/BUILD.gn
index 19dfa49..2e0e0c0 100644
--- a/src/sys/pkg/lib/event-queue/BUILD.gn
+++ b/src/sys/pkg/lib/event-queue/BUILD.gn
@@ -17,7 +17,7 @@
test_deps = [
":test.pkg.eventqueue-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//third_party/rust_crates:matches",
]
diff --git a/src/sys/pkg/lib/forced-fdr/BUILD.gn b/src/sys/pkg/lib/forced-fdr/BUILD.gn
index c476487..c97273e 100644
--- a/src/sys/pkg/lib/forced-fdr/BUILD.gn
+++ b/src/sys/pkg/lib/forced-fdr/BUILD.gn
@@ -13,9 +13,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.recovery:fuchsia.recovery-rustc",
"//sdk/fidl/fuchsia.update.channel:fuchsia.update.channel-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/pkg/lib/fuchsia-pkg-testing/BUILD.gn b/src/sys/pkg/lib/fuchsia-pkg-testing/BUILD.gn
index a07fee1..31a66fa 100644
--- a/src/sys/pkg/lib/fuchsia-pkg-testing/BUILD.gn
+++ b/src/sys/pkg/lib/fuchsia-pkg-testing/BUILD.gn
@@ -16,10 +16,10 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-hyper",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/pkg/lib/pkgfs/BUILD.gn b/src/sys/pkg/lib/pkgfs/BUILD.gn
index ddbdb431..a40926f 100644
--- a/src/sys/pkg/lib/pkgfs/BUILD.gn
+++ b/src/sys/pkg/lib/pkgfs/BUILD.gn
@@ -14,9 +14,9 @@
deps = [
"//garnet/lib/rust/files_async",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/pkg/lib/system-health-check/BUILD.gn b/src/sys/pkg/lib/system-health-check/BUILD.gn
index dbda155..fc8a007 100644
--- a/src/sys/pkg/lib/system-health-check/BUILD.gn
+++ b/src/sys/pkg/lib/system-health-check/BUILD.gn
@@ -12,7 +12,7 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/pkg/testing/blobfs-ramdisk/BUILD.gn b/src/sys/pkg/testing/blobfs-ramdisk/BUILD.gn
index 58b4d2e..fed4200 100644
--- a/src/sys/pkg/testing/blobfs-ramdisk/BUILD.gn
+++ b/src/sys/pkg/testing/blobfs-ramdisk/BUILD.gn
@@ -13,8 +13,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/pkg/testing/pkgfs-ramdisk/BUILD.gn b/src/sys/pkg/testing/pkgfs-ramdisk/BUILD.gn
index 6674236..9e2c61f 100644
--- a/src/sys/pkg/testing/pkgfs-ramdisk/BUILD.gn
+++ b/src/sys/pkg/testing/pkgfs-ramdisk/BUILD.gn
@@ -13,8 +13,8 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-runtime",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/pkg/tests/amberctl/BUILD.gn b/src/sys/pkg/tests/amberctl/BUILD.gn
index 82736f6e..9d8c39f 100644
--- a/src/sys/pkg/tests/amberctl/BUILD.gn
+++ b/src/sys/pkg/tests/amberctl/BUILD.gn
@@ -12,13 +12,13 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.amber:fuchsia.amber-rustc",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.pkg.rewrite:fuchsia.pkg.rewrite-rustc",
"//sdk/fidl/fuchsia.space:fuchsia.space-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//sdk/fidl/fuchsia.update:fuchsia.update-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/pkg/tests/pkg-resolver/BUILD.gn b/src/sys/pkg/tests/pkg-resolver/BUILD.gn
index a73fd07..2a11b41 100644
--- a/src/sys/pkg/tests/pkg-resolver/BUILD.gn
+++ b/src/sys/pkg/tests/pkg-resolver/BUILD.gn
@@ -12,13 +12,13 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-hyper",
"//sdk/fidl/fuchsia.amber:fuchsia.amber-rustc",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.pkg.rewrite:fuchsia.pkg.rewrite-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-url",
diff --git a/src/sys/pkg/tests/system-updater/BUILD.gn b/src/sys/pkg/tests/system-updater/BUILD.gn
index fdfde74..de3c5d7 100644
--- a/src/sys/pkg/tests/system-updater/BUILD.gn
+++ b/src/sys/pkg/tests/system-updater/BUILD.gn
@@ -12,11 +12,11 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.amber:fuchsia.amber-rustc",
"//sdk/fidl/fuchsia.pkg:fuchsia.pkg-rustc",
"//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/sys/stash/BUILD.gn b/src/sys/stash/BUILD.gn
index 8d8806b..ddc1314 100644
--- a/src/sys/stash/BUILD.gn
+++ b/src/sys/stash/BUILD.gn
@@ -13,8 +13,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/test_adapters/gtest/BUILD.gn b/src/sys/test_adapters/gtest/BUILD.gn
index 8ba4e55..614ca1b 100644
--- a/src/sys/test_adapters/gtest/BUILD.gn
+++ b/src/sys/test_adapters/gtest/BUILD.gn
@@ -14,8 +14,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/test_adapters/rust/BUILD.gn b/src/sys/test_adapters/rust/BUILD.gn
index bbead00..e9b712d 100644
--- a/src/sys/test_adapters/rust/BUILD.gn
+++ b/src/sys/test_adapters/rust/BUILD.gn
@@ -14,8 +14,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/sys/test_manager/BUILD.gn b/src/sys/test_manager/BUILD.gn
index a498a3d..d8e7b31 100644
--- a/src/sys/test_manager/BUILD.gn
+++ b/src/sys/test_manager/BUILD.gn
@@ -21,9 +21,9 @@
deps = [
"fidl:test_manager-rustc",
"//garnet/lib/rust/io_util",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.sys2:fuchsia.sys2-rustc",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/test_executor/rust:test_executor",
diff --git a/src/sys/test_manager/tests/BUILD.gn b/src/sys/test_manager/tests/BUILD.gn
index 2493525..2ab9d5e 100644
--- a/src/sys/test_manager/tests/BUILD.gn
+++ b/src/sys/test_manager/tests/BUILD.gn
@@ -10,8 +10,8 @@
name = "test_manager_test"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.test:fuchsia.test-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/src/sys/timekeeper/BUILD.gn b/src/sys/timekeeper/BUILD.gn
index 5b27761..0c9d2fc 100644
--- a/src/sys/timekeeper/BUILD.gn
+++ b/src/sys/timekeeper/BUILD.gn
@@ -52,8 +52,8 @@
deps = [
":fuchsia.time-rustc",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.deprecatedtimezone:fuchsia.deprecatedtimezone-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/inspect/rust/fuchsia-inspect",
diff --git a/src/sys/tools/cs/BUILD.gn b/src/sys/tools/cs/BUILD.gn
index 0c78353..1e9f414 100644
--- a/src/sys/tools/cs/BUILD.gn
+++ b/src/sys/tools/cs/BUILD.gn
@@ -11,8 +11,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/zircon/rust:fuchsia-zircon",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:thiserror",
@@ -26,7 +26,7 @@
deps = [
":lib",
- "//garnet/public/lib/fidl/rust/fidl",
+ "//src/lib/fidl/rust/fidl",
"//third_party/rust_crates:anyhow",
"//third_party/rust_crates:structopt",
"//third_party/rust_crates:thiserror",
diff --git a/src/sys/tools/stash_ctl/BUILD.gn b/src/sys/tools/stash_ctl/BUILD.gn
index d2df574..04923e5 100644
--- a/src/sys/tools/stash_ctl/BUILD.gn
+++ b/src/sys/tools/stash_ctl/BUILD.gn
@@ -13,9 +13,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.stash:fuchsia.stash-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/ui/bin/brightness_manager/BUILD.gn b/src/ui/bin/brightness_manager/BUILD.gn
index a31aaf9..484698c 100644
--- a/src/ui/bin/brightness_manager/BUILD.gn
+++ b/src/ui/bin/brightness_manager/BUILD.gn
@@ -14,10 +14,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.brightness:fuchsia.ui.brightness-rustc",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//src/lib/fdio/rust:fdio",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/fuchsia-runtime",
diff --git a/src/ui/bin/brightness_manager/brightness_command/BUILD.gn b/src/ui/bin/brightness_manager/brightness_command/BUILD.gn
index 937fba7..104c9ac 100644
--- a/src/ui/bin/brightness_manager/brightness_command/BUILD.gn
+++ b/src/ui/bin/brightness_manager/brightness_command/BUILD.gn
@@ -13,9 +13,9 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.brightness:fuchsia.ui.brightness-rustc",
"//src/lib/argh",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/ui/bin/default_hardware_ime/BUILD.gn b/src/ui/bin/default_hardware_ime/BUILD.gn
index fc34feb..cfecf05 100644
--- a/src/ui/bin/default_hardware_ime/BUILD.gn
+++ b/src/ui/bin/default_hardware_ime/BUILD.gn
@@ -18,10 +18,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.text:fuchsia.ui.text-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/ui/bin/ime/BUILD.gn b/src/ui/bin/ime/BUILD.gn
index 50fc651..5826c7c 100644
--- a/src/ui/bin/ime/BUILD.gn
+++ b/src/ui/bin/ime/BUILD.gn
@@ -22,12 +22,12 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.text:fuchsia.ui.text-rustc",
"//sdk/fidl/fuchsia.ui.text.testing:fuchsia.ui.text.testing-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -99,10 +99,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/ui/bin/shortcut/BUILD.gn b/src/ui/bin/shortcut/BUILD.gn
index 87a2cbe..3ff4647 100644
--- a/src/ui/bin/shortcut/BUILD.gn
+++ b/src/ui/bin/shortcut/BUILD.gn
@@ -28,10 +28,10 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.shortcut:fuchsia.ui.shortcut-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -70,10 +70,10 @@
deps = [
":bin",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.shortcut:fuchsia.ui.shortcut-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/ui/lib/text/BUILD.gn b/src/ui/lib/text/BUILD.gn
index 9162ff4..c359e97 100644
--- a/src/ui/lib/text/BUILD.gn
+++ b/src/ui/lib/text/BUILD.gn
@@ -9,10 +9,10 @@
with_unit_tests = true
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
"//sdk/fidl/fuchsia.ui.text:fuchsia.ui.text-rustc",
"//sdk/fidl/fuchsia.ui.text.testing:fuchsia.ui.text.testing-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/ui/testing/text/BUILD.gn b/src/ui/testing/text/BUILD.gn
index e1dd66c..601475d 100644
--- a/src/ui/testing/text/BUILD.gn
+++ b/src/ui/testing/text/BUILD.gn
@@ -13,9 +13,9 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.text:fuchsia.ui.text-rustc",
"//sdk/fidl/fuchsia.ui.text.testing:fuchsia.ui.text.testing-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/mundane",
diff --git a/src/ui/tests/e2e_input_tests/keyboard/BUILD.gn b/src/ui/tests/e2e_input_tests/keyboard/BUILD.gn
index a707f10..0bd9660 100644
--- a/src/ui/tests/e2e_input_tests/keyboard/BUILD.gn
+++ b/src/ui/tests/e2e_input_tests/keyboard/BUILD.gn
@@ -20,9 +20,9 @@
deps = [
":ui-test-tools",
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
@@ -40,10 +40,10 @@
version = "0.1.0"
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
"//sdk/fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
"//sdk/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
"//src/lib/ui/fuchsia-scenic",
diff --git a/src/ui/tests/e2e_input_tests/shortcut/BUILD.gn b/src/ui/tests/e2e_input_tests/shortcut/BUILD.gn
index 4bf1c81..e7a6a5e 100644
--- a/src/ui/tests/e2e_input_tests/shortcut/BUILD.gn
+++ b/src/ui/tests/e2e_input_tests/shortcut/BUILD.gn
@@ -19,10 +19,10 @@
with_unit_tests = true
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.ui.input2:fuchsia.ui.input2-rustc",
"//sdk/fidl/fuchsia.ui.shortcut:fuchsia.ui.shortcut-rustc",
"//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/syslog/rust:syslog",
diff --git a/src/virtualization/tests/virtio_vsock_test_util/BUILD.gn b/src/virtualization/tests/virtio_vsock_test_util/BUILD.gn
index ec06154..ea622f7 100644
--- a/src/virtualization/tests/virtio_vsock_test_util/BUILD.gn
+++ b/src/virtualization/tests/virtio_vsock_test_util/BUILD.gn
@@ -10,8 +10,8 @@
edition = "2018"
deps = [
- "//garnet/public/lib/fidl/rust/fidl",
"//sdk/fidl/fuchsia.vsock:fuchsia.vsock-rustc",
+ "//src/lib/fidl/rust/fidl",
"//src/lib/fuchsia-async",
"//src/lib/fuchsia-component",
"//src/lib/zircon/rust:fuchsia-zircon",
diff --git a/tools/fidl/gidl/README.md b/tools/fidl/gidl/README.md
index e10fef29..65ffbd56 100644
--- a/tools/fidl/gidl/README.md
+++ b/tools/fidl/gidl/README.md
@@ -40,7 +40,7 @@
* Run: `fx run-test fidl_llcpp_conformance_test`
* Rust:
- * Build: `fx build garnet/public/lib/fidl/rust/fidl_tests`
+ * Build: `fx build src/lib/fidl/rust/fidl_tests`
* Run: `fx run-test rust_fidl_tests`
* Dart:
diff --git a/tools/fidl/gidl/rust/rust.go b/tools/fidl/gidl/rust/rust.go
index 9cf3036..ef419fe 100644
--- a/tools/fidl/gidl/rust/rust.go
+++ b/tools/fidl/gidl/rust/rust.go
@@ -425,7 +425,7 @@
panic(fmt.Sprintf("unexpected decl %v", decl))
}
-// Rust errors are defined in garnet/public/lib/fidl/rust/fidl/src/error.rs
+// Rust errors are defined in src/lib/fidl/rust/fidl/src/error.rs
var rustErrorCodeNames = map[gidlir.ErrorCode]string{
gidlir.StringTooLong: "OutOfRange",
gidlir.NonEmptyStringWithNullBody: "UnexpectedNullRef",
