[sdk] Remove uses of ${garnet,peridot}_sdk_fidl

We no longer need these variables now that the FIDL files have been
moved to //sdk.

git grep -l '$garnet_sdk_fidl' | xargs -n 1 sed -i -e 's^$garnet_sdk_fidl^//sdk/fidl^'
git grep -l '$peridot_sdk_fidl' | xargs -n 1 sed -i -e 's^$peridot_sdk_fidl^//sdk/fidl^'

Test: Compiles.
Change-Id: Ib5ad4fe01358021dfc04c40f4ca31aa3b6f676e1
diff --git a/app/dashboard/BUILD.gn b/app/dashboard/BUILD.gn
index abe5285..7162b5c 100644
--- a/app/dashboard/BUILD.gn
+++ b/app/dashboard/BUILD.gn
@@ -30,8 +30,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.testing.runner",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.testing.runner",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/buildbucket",
     "//third_party/dart-pkg/pub/html",
diff --git a/app/latin-ime/BUILD.gn b/app/latin-ime/BUILD.gn
index b2fda43..a769693 100644
--- a/app/latin-ime/BUILD.gn
+++ b/app/latin-ime/BUILD.gn
@@ -20,8 +20,8 @@
   sources = []
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
-    "$garnet_sdk_fidl/fuchsia.ui.policy",
+    "//sdk/fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.ui.policy",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/app/maxwell/agents/module_suggester_dart/BUILD.gn b/app/maxwell/agents/module_suggester_dart/BUILD.gn
index 3f98566..d76cbbe 100644
--- a/app/maxwell/agents/module_suggester_dart/BUILD.gn
+++ b/app/maxwell/agents/module_suggester_dart/BUILD.gn
@@ -19,7 +19,7 @@
   sources = []
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/module_resolver/dart",
     "//topaz/public/lib/proposal/dart",
diff --git a/app/maxwell/agents/usage_log/BUILD.gn b/app/maxwell/agents/usage_log/BUILD.gn
index 0b705c7..1d003f3 100644
--- a/app/maxwell/agents/usage_log/BUILD.gn
+++ b/app/maxwell/agents/usage_log/BUILD.gn
@@ -25,7 +25,7 @@
   non_dart_deps = [ ":module_usage_tracking_metrics_registry" ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/context/dart",
diff --git a/app/term/BUILD.gn b/app/term/BUILD.gn
index 58720e2..fc4e473 100644
--- a/app/term/BUILD.gn
+++ b/app/term/BUILD.gn
@@ -24,11 +24,11 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.fonts",
-    "$garnet_sdk_fidl/fuchsia.math",
-    "$garnet_sdk_fidl/fuchsia.ui.input",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.fonts",
+    "//sdk/fidl/fuchsia.math",
+    "//sdk/fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/component/cpp",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
diff --git a/auth_providers/google/BUILD.gn b/auth_providers/google/BUILD.gn
index e38ea86..2e1ba67 100644
--- a/auth_providers/google/BUILD.gn
+++ b/auth_providers/google/BUILD.gn
@@ -17,7 +17,7 @@
 
   deps = [
     ":lib",
-    "$garnet_sdk_fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.auth",
     "//garnet/public/lib/component/cpp",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
@@ -39,15 +39,15 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.net.oldhttp",
+    "//sdk/fidl/fuchsia.net.oldhttp",
     "//garnet/public/lib/svc/cpp",
     "//peridot/lib/rapidjson",
     "//topaz/auth_providers/oauth",
   ]
 
   public_deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
-    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.ui.app",
     "//garnet/public/lib/callback",
     "//garnet/public/lib/component/cpp",
     "//sdk/lib/fidl/cpp",
@@ -71,7 +71,7 @@
 
   deps = [
     ":lib",
-    "$garnet_sdk_fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.auth",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fxl:fxl_printers",
     "//garnet/public/lib/gtest:gtest",
diff --git a/auth_providers/oauth/BUILD.gn b/auth_providers/oauth/BUILD.gn
index b720118..b803fbb 100644
--- a/auth_providers/oauth/BUILD.gn
+++ b/auth_providers/oauth/BUILD.gn
@@ -13,7 +13,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.auth",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/network_wrapper",
diff --git a/auth_providers/spotify/BUILD.gn b/auth_providers/spotify/BUILD.gn
index 61679c0..7813fd6 100644
--- a/auth_providers/spotify/BUILD.gn
+++ b/auth_providers/spotify/BUILD.gn
@@ -17,7 +17,7 @@
 
   deps = [
     ":lib",
-    "$garnet_sdk_fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.auth",
     "//garnet/public/lib/component/cpp",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
@@ -38,7 +38,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.net.oldhttp",
+    "//sdk/fidl/fuchsia.net.oldhttp",
     "//garnet/public/lib/svc/cpp",
     "//peridot/lib/rapidjson",
     "//third_party/rapidjson",
@@ -46,8 +46,8 @@
   ]
 
   public_deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
-    "$garnet_sdk_fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.ui.app",
     "//garnet/public/lib/callback",
     "//garnet/public/lib/component/cpp",
     "//sdk/lib/fidl/cpp",
@@ -68,7 +68,7 @@
 
   deps = [
     ":lib",
-    "$garnet_sdk_fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.auth",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fxl:fxl_printers",
     "//garnet/public/lib/gtest:gtest",
diff --git a/bin/bluetooth_settings/BUILD.gn b/bin/bluetooth_settings/BUILD.gn
index 8086468..e0aad2c 100644
--- a/bin/bluetooth_settings/BUILD.gn
+++ b/bin/bluetooth_settings/BUILD.gn
@@ -23,10 +23,10 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.bluetooth",
-    "$garnet_sdk_fidl/fuchsia.bluetooth.control",
-    "$garnet_sdk_fidl/fuchsia.bluetooth.gatt",
-    "$garnet_sdk_fidl/fuchsia.bluetooth.le",
+    "//sdk/fidl/fuchsia.bluetooth",
+    "//sdk/fidl/fuchsia.bluetooth.control",
+    "//sdk/fidl/fuchsia.bluetooth.gatt",
+    "//sdk/fidl/fuchsia.bluetooth.le",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/dart_fidl_json/dart_fidl_json.gni b/bin/dart_fidl_json/dart_fidl_json.gni
index e404144..b573a73 100644
--- a/bin/dart_fidl_json/dart_fidl_json.gni
+++ b/bin/dart_fidl_json/dart_fidl_json.gni
@@ -13,7 +13,7 @@
 #
 #   fidl_target (required)
 #     Specifies the fidl target from which to read fidl json. For example,
-#     "$garnet_sdk_fidl/fuchsia.setui" for fuchsia.setui.
+#     "//sdk/fidl/fuchsia.setui" for fuchsia.setui.
 #
 #   template_path (optional)
 #     Specifies the template to use to generate the formatting code. Default
diff --git a/bin/device_settings/BUILD.gn b/bin/device_settings/BUILD.gn
index 798fe8e..d8fb59f 100644
--- a/bin/device_settings/BUILD.gn
+++ b/bin/device_settings/BUILD.gn
@@ -23,7 +23,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.amber",
+    "//sdk/fidl/fuchsia.amber",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/display_settings/BUILD.gn b/bin/display_settings/BUILD.gn
index b74cdfe..8c43870 100644
--- a/bin/display_settings/BUILD.gn
+++ b/bin/display_settings/BUILD.gn
@@ -21,7 +21,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.amber",
+    "//sdk/fidl/fuchsia.amber",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/ermine_ctl/BUILD.gn b/bin/ermine_ctl/BUILD.gn
index 56fd29e..0840229 100644
--- a/bin/ermine_ctl/BUILD.gn
+++ b/bin/ermine_ctl/BUILD.gn
@@ -9,7 +9,7 @@
   name = "ermine_ctl"
   edition = "2018"
   deps = [
-    "$garnet_sdk_fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
+    "//sdk/fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-async",
diff --git a/bin/flutter_screencap_test/BUILD.gn b/bin/flutter_screencap_test/BUILD.gn
index ddf8997..a5f1b76 100644
--- a/bin/flutter_screencap_test/BUILD.gn
+++ b/bin/flutter_screencap_test/BUILD.gn
@@ -18,8 +18,8 @@
   sources = []
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
-    "$garnet_sdk_fidl/fuchsia.testing.runner",
+    "//sdk/fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.testing.runner",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/bin/session_shell/ermine_session_shell/BUILD.gn b/bin/session_shell/ermine_session_shell/BUILD.gn
index c335ff4..f4c6c8b 100644
--- a/bin/session_shell/ermine_session_shell/BUILD.gn
+++ b/bin/session_shell/ermine_session_shell/BUILD.gn
@@ -10,21 +10,21 @@
   edition = "2018"
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
-    "$garnet_sdk_fidl/fuchsia.math:fuchsia.math-rustc",
-    "$garnet_sdk_fidl/fuchsia.sys:fuchsia.sys-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
+    "//sdk/fidl/fuchsia.developer.tiles:fuchsia.developer.tiles-rustc",
+    "//sdk/fidl/fuchsia.math:fuchsia.math-rustc",
+    "//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
+    "//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
+    "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input-rustc",
+    "//sdk/fidl/fuchsia.ui.policy:fuchsia.ui.policy-rustc",
+    "//sdk/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic-rustc",
+    "//sdk/fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
+    "//sdk/fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-async",
     "//garnet/public/rust/fuchsia-scenic",
     "//garnet/public/rust/fuchsia-zircon",
-    "$peridot_sdk_fidl/fuchsia.modular:fuchsia.modular-rustc",
+    "//sdk/fidl/fuchsia.modular:fuchsia.modular-rustc",
     "//third_party/rust-crates/rustc_deps:failure",
     "//third_party/rust-crates/rustc_deps:futures-preview",
     "//third_party/rust-crates/rustc_deps:itertools",
diff --git a/bin/session_shell/ermine_session_shell/README.md b/bin/session_shell/ermine_session_shell/README.md
index a874256..d414a39 100644
--- a/bin/session_shell/ermine_session_shell/README.md
+++ b/bin/session_shell/ermine_session_shell/README.md
@@ -9,7 +9,7 @@
 This initial version implements the same approach for view hosting,
 layout and control as ``//garnet/bin/developer/[tiles|tiles_ctl]``. For
 simplicity it re-uses
-``$garnet_sdk_fidl/fuchsia.developer.tiles/tiles.fidl``.
+``//sdk/fidl/fuchsia.developer.tiles/tiles.fidl``.
 
 There is an `ermine_ctl` program you can use to list and remove stories from Ermine. This
 program will be removed as soon as sessionctl supports "list" and "remove".
diff --git a/bin/system_dashboard/BUILD.gn b/bin/system_dashboard/BUILD.gn
index 2df6051..eff7539 100644
--- a/bin/system_dashboard/BUILD.gn
+++ b/bin/system_dashboard/BUILD.gn
@@ -19,7 +19,7 @@
 
   sources = []
   deps = [
-    "$garnet_sdk_fidl/fuchsia.scpi",
+    "//sdk/fidl/fuchsia.scpi",
     "//third_party/dart-pkg/pub/flutter_staggered_grid_view",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
diff --git a/bin/ui/skottie_viewer/BUILD.gn b/bin/ui/skottie_viewer/BUILD.gn
index f158d43..6ada5a6 100644
--- a/bin/ui/skottie_viewer/BUILD.gn
+++ b/bin/ui/skottie_viewer/BUILD.gn
@@ -29,8 +29,8 @@
 
   deps = [
     ":skottie_loader",
-    "$garnet_sdk_fidl/fuchsia.ui.app",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/component/cpp",
     "//sdk/lib/fidl/cpp",
 
diff --git a/bin/userpicker_base_shell/BUILD.gn b/bin/userpicker_base_shell/BUILD.gn
index 8be4e9c..b057a8a 100644
--- a/bin/userpicker_base_shell/BUILD.gn
+++ b/bin/userpicker_base_shell/BUILD.gn
@@ -49,11 +49,11 @@
   non_dart_deps = [ ":sysui_metrics_config" ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.timezone",
-    "$garnet_sdk_fidl/fuchsia.ui.input",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$peridot_sdk_fidl/fuchsia.modular",
-    "$peridot_sdk_fidl/fuchsia.modular.auth",
+    "//sdk/fidl/fuchsia.timezone",
+    "//sdk/fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular.auth",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/http",
     "//topaz/lib/base_shell:lib.base_shell",
diff --git a/bin/voila/BUILD.gn b/bin/voila/BUILD.gn
index b3d099e..e540dd1 100644
--- a/bin/voila/BUILD.gn
+++ b/bin/voila/BUILD.gn
@@ -9,19 +9,19 @@
   name = "voila"
   edition = "2018"
   deps = [
-    "$garnet_sdk_fidl/fuchsia.auth:fuchsia.auth-rustc",
-    "$garnet_sdk_fidl/fuchsia.math:fuchsia.math-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
+    "//sdk/fidl/fuchsia.auth:fuchsia.auth-rustc",
+    "//sdk/fidl/fuchsia.math:fuchsia.math-rustc",
+    "//sdk/fidl/fuchsia.ui.gfx:fuchsia.ui.gfx-rustc",
+    "//sdk/fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
+    "//sdk/fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
     "//garnet/public/rust/carnelian",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-async",
     "//garnet/public/rust/fuchsia-scenic",
-    "$peridot_sdk_fidl/fuchsia.modular:fuchsia.modular-rustc",
-    "$peridot_sdk_fidl/fuchsia.modular.auth:fuchsia.modular.auth-rustc",
-    "$peridot_sdk_fidl/fuchsia.modular.internal:fuchsia.modular.internal-rustc",
+    "//sdk/fidl/fuchsia.modular:fuchsia.modular-rustc",
+    "//sdk/fidl/fuchsia.modular.auth:fuchsia.modular.auth-rustc",
+    "//sdk/fidl/fuchsia.modular.internal:fuchsia.modular.internal-rustc",
     "//third_party/rust-crates/rustc_deps:failure",
     "//third_party/rust-crates/rustc_deps:futures-preview",
     "//third_party/rust-crates/rustc_deps:log",
diff --git a/bin/wifi_settings/BUILD.gn b/bin/wifi_settings/BUILD.gn
index 4c2e85e..445737f 100644
--- a/bin/wifi_settings/BUILD.gn
+++ b/bin/wifi_settings/BUILD.gn
@@ -24,8 +24,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.netstack",
-    "$garnet_sdk_fidl/fuchsia.wlan.service",
+    "//sdk/fidl/fuchsia.netstack",
+    "//sdk/fidl/fuchsia.wlan.service",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/settings:lib.settings",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/bin/xi/xi_mod/BUILD.gn b/bin/xi/xi_mod/BUILD.gn
index ec89f77..8d79313 100644
--- a/bin/xi/xi_mod/BUILD.gn
+++ b/bin/xi/xi_mod/BUILD.gn
@@ -17,9 +17,9 @@
 
   sources = []
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$garnet_sdk_fidl/fuchsia.xi",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.xi",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
     "//topaz/lib/xi/widgets:xi_widgets",
diff --git a/bin/xi/xi_session_agent/BUILD.gn b/bin/xi/xi_session_agent/BUILD.gn
index d25807d..af7ba35 100644
--- a/bin/xi/xi_session_agent/BUILD.gn
+++ b/bin/xi/xi_session_agent/BUILD.gn
@@ -24,7 +24,7 @@
 
   deps = [
     ":xi_session_services",
-    "$garnet_sdk_fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.auth",
     "//topaz/lib/xi/fuchsia_client:xi_fuchsia_client",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/agent/dart",
diff --git a/examples/eddystone_agent/BUILD.gn b/examples/eddystone_agent/BUILD.gn
index c674723..b76e5f4 100644
--- a/examples/eddystone_agent/BUILD.gn
+++ b/examples/eddystone_agent/BUILD.gn
@@ -11,9 +11,9 @@
 
   sources = []
   deps = [
-    "$garnet_sdk_fidl/fuchsia.bluetooth",
-    "$garnet_sdk_fidl/fuchsia.bluetooth.le",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.bluetooth",
+    "//sdk/fidl/fuchsia.bluetooth.le",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app/dart",
diff --git a/examples/fidl/BUILD.gn b/examples/fidl/BUILD.gn
index 9f8d25a..1a9c49c 100644
--- a/examples/fidl/BUILD.gn
+++ b/examples/fidl/BUILD.gn
@@ -14,7 +14,7 @@
       sources = []
       deps = [
         "//garnet/examples/fidl/services:echo2",
-        "$garnet_sdk_fidl/fuchsia.sys",
+        "//sdk/fidl/fuchsia.sys",
         "//topaz/public/dart/fidl",
         "//topaz/public/lib/app/dart",
       ]
diff --git a/examples/fidl/echo_client_async_dart/BUILD.gn b/examples/fidl/echo_client_async_dart/BUILD.gn
index fd1e9c6..a963f64 100644
--- a/examples/fidl/echo_client_async_dart/BUILD.gn
+++ b/examples/fidl/echo_client_async_dart/BUILD.gn
@@ -18,7 +18,7 @@
   sources = []
   deps = [
     "//garnet/examples/fidl/services:echo2",
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_services",
   ]
diff --git a/examples/fidl/fidl_bindings_performance/BUILD.gn b/examples/fidl/fidl_bindings_performance/BUILD.gn
index 1247d84..4a73fb3 100644
--- a/examples/fidl/fidl_bindings_performance/BUILD.gn
+++ b/examples/fidl/fidl_bindings_performance/BUILD.gn
@@ -18,7 +18,7 @@
   sources = []
   deps = [
     "//garnet/examples/fidl/services:echo2",
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/args",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/examples/ledger/todo_list/BUILD.gn b/examples/ledger/todo_list/BUILD.gn
index 55c90a1..2e6d6aa 100644
--- a/examples/ledger/todo_list/BUILD.gn
+++ b/examples/ledger/todo_list/BUILD.gn
@@ -22,7 +22,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.ledger",
+    "//sdk/fidl/fuchsia.ledger",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/app_driver/dart",
diff --git a/examples/media/vu_meter/BUILD.gn b/examples/media/vu_meter/BUILD.gn
index 8b2f9dc..07b620a 100644
--- a/examples/media/vu_meter/BUILD.gn
+++ b/examples/media/vu_meter/BUILD.gn
@@ -12,7 +12,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.media",
+    "//sdk/fidl/fuchsia.media",
     "//garnet/public/lib/media/audio",
     "//garnet/public/lib/ui/base_view/cpp",
     "//third_party/skia",
diff --git a/examples/mediaplayer/mediaplayer_flutter/BUILD.gn b/examples/mediaplayer/mediaplayer_flutter/BUILD.gn
index b8e85a8..3cb3b65 100644
--- a/examples/mediaplayer/mediaplayer_flutter/BUILD.gn
+++ b/examples/mediaplayer/mediaplayer_flutter/BUILD.gn
@@ -16,8 +16,8 @@
         "config.dart",
       ]
       deps = [
-        "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-        "$peridot_sdk_fidl/fuchsia.modular",
+        "//sdk/fidl/fuchsia.ui.viewsv1",
+        "//sdk/fidl/fuchsia.modular",
         "//third_party/dart-pkg/git/flutter/packages/flutter",
         "//topaz/public/dart/fidl",
         "//topaz/public/dart/fuchsia",
diff --git a/examples/mediaplayer/mediaplayer_skia/BUILD.gn b/examples/mediaplayer/mediaplayer_skia/BUILD.gn
index bbefba5..310fccf 100644
--- a/examples/mediaplayer/mediaplayer_skia/BUILD.gn
+++ b/examples/mediaplayer/mediaplayer_skia/BUILD.gn
@@ -16,8 +16,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.media",
-    "$garnet_sdk_fidl/fuchsia.mediaplayer",
+    "//sdk/fidl/fuchsia.media",
+    "//sdk/fidl/fuchsia.mediaplayer",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/media/timeline",
     "//garnet/public/lib/ui/base_view/cpp",
diff --git a/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn b/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
index ed6d233..968b714 100644
--- a/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
+++ b/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
@@ -21,8 +21,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/examples/tictactoe/lib/tictactoe/common",
     "//topaz/examples/tictactoe/public/fidl/tictactoe:game_tracker_service",
     "//topaz/public/dart/fidl",
diff --git a/examples/ui/jank/BUILD.gn b/examples/ui/jank/BUILD.gn
index 2e544fc..55b76c0 100644
--- a/examples/ui/jank/BUILD.gn
+++ b/examples/ui/jank/BUILD.gn
@@ -14,9 +14,9 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.app",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/ui/base_view/cpp",
diff --git a/examples/ui/lib/BUILD.gn b/examples/ui/lib/BUILD.gn
index 0719293..2ccfe76 100644
--- a/examples/ui/lib/BUILD.gn
+++ b/examples/ui/lib/BUILD.gn
@@ -46,7 +46,7 @@
   deps = [
     ":skia_type_converters",
     ":skia_vmo",
-    "$garnet_sdk_fidl/fuchsia.fonts",
+    "//sdk/fidl/fuchsia.fonts",
     "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
@@ -61,7 +61,7 @@
   ]
 
   public_deps = [
-    "$garnet_sdk_fidl/fuchsia.math",
+    "//sdk/fidl/fuchsia.math",
     "//garnet/public/lib/fsl",
     "//third_party/skia",
   ]
diff --git a/examples/ui/localized_mod/BUILD.gn b/examples/ui/localized_mod/BUILD.gn
index 37a8d4e..2a6e980 100644
--- a/examples/ui/localized_mod/BUILD.gn
+++ b/examples/ui/localized_mod/BUILD.gn
@@ -11,9 +11,9 @@
   sources = []
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.gfx",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/git/flutter/packages/flutter_localizations",
     "//third_party/dart/third_party/pkg/intl",
diff --git a/examples/ui/noodles/BUILD.gn b/examples/ui/noodles/BUILD.gn
index 548d706..3edcc48 100644
--- a/examples/ui/noodles/BUILD.gn
+++ b/examples/ui/noodles/BUILD.gn
@@ -14,9 +14,9 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.app",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
diff --git a/examples/ui/paint/BUILD.gn b/examples/ui/paint/BUILD.gn
index 0856c6a..7544cfa 100644
--- a/examples/ui/paint/BUILD.gn
+++ b/examples/ui/paint/BUILD.gn
@@ -14,9 +14,9 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.app",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//sdk/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
diff --git a/examples/ui/simple_flutter/BUILD.gn b/examples/ui/simple_flutter/BUILD.gn
index ed4eb84..d7859dc 100644
--- a/examples/ui/simple_flutter/BUILD.gn
+++ b/examples/ui/simple_flutter/BUILD.gn
@@ -13,9 +13,9 @@
       main_dart = "lib/main.dart"
       sources = []
       deps = [
-        "$garnet_sdk_fidl/fuchsia.ui.gfx",
-        "$garnet_sdk_fidl/fuchsia.ui.scenic",
-        "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+        "//sdk/fidl/fuchsia.ui.gfx",
+        "//sdk/fidl/fuchsia.ui.scenic",
+        "//sdk/fidl/fuchsia.ui.viewsv1",
         "//third_party/dart-pkg/git/flutter/packages/flutter",
         "//topaz/public/dart/widgets:lib.widgets",
         "//topaz/public/lib/ui/flutter",
diff --git a/examples/ui/sketchy_flutter/BUILD.gn b/examples/ui/sketchy_flutter/BUILD.gn
index 07ca9cd..8e75ede 100644
--- a/examples/ui/sketchy_flutter/BUILD.gn
+++ b/examples/ui/sketchy_flutter/BUILD.gn
@@ -20,9 +20,9 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.gfx",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/lib/ui/flutter",
     "//topaz/public/lib/ui/scenic/dart",
diff --git a/examples/ui/text_flutter/BUILD.gn b/examples/ui/text_flutter/BUILD.gn
index a0bb192..f218264 100644
--- a/examples/ui/text_flutter/BUILD.gn
+++ b/examples/ui/text_flutter/BUILD.gn
@@ -10,9 +10,9 @@
   sources = []
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.gfx",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/widgets:lib.widgets",
     "//topaz/public/lib/app_driver/dart",
diff --git a/lib/base_shell/BUILD.gn b/lib/base_shell/BUILD.gn
index 574bd51..887dcf8 100644
--- a/lib/base_shell/BUILD.gn
+++ b/lib/base_shell/BUILD.gn
@@ -15,12 +15,12 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.netstack",
-    "$garnet_sdk_fidl/fuchsia.timezone",
-    "$garnet_sdk_fidl/fuchsia.ui.input",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$peridot_sdk_fidl/fuchsia.modular",
-    "$peridot_sdk_fidl/fuchsia.modular.auth",
+    "//sdk/fidl/fuchsia.netstack",
+    "//sdk/fidl/fuchsia.timezone",
+    "//sdk/fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular.auth",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_scenic_flutter",
diff --git a/lib/keyboard/dart/BUILD.gn b/lib/keyboard/dart/BUILD.gn
index f75812d..613e0bb 100644
--- a/lib/keyboard/dart/BUILD.gn
+++ b/lib/keyboard/dart/BUILD.gn
@@ -12,7 +12,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
diff --git a/lib/keyboard/flutter/test/BUILD.gn b/lib/keyboard/flutter/test/BUILD.gn
index 11aa809..7244a0c 100644
--- a/lib/keyboard/flutter/test/BUILD.gn
+++ b/lib/keyboard/flutter/test/BUILD.gn
@@ -15,7 +15,7 @@
   source_dir = "dart"
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/keyboard_deprecated/dart/BUILD.gn b/lib/keyboard_deprecated/dart/BUILD.gn
index f75812d..613e0bb 100644
--- a/lib/keyboard_deprecated/dart/BUILD.gn
+++ b/lib/keyboard_deprecated/dart/BUILD.gn
@@ -12,7 +12,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
diff --git a/lib/keyboard_deprecated/flutter/test/BUILD.gn b/lib/keyboard_deprecated/flutter/test/BUILD.gn
index 11aa809..7244a0c 100644
--- a/lib/keyboard_deprecated/flutter/test/BUILD.gn
+++ b/lib/keyboard_deprecated/flutter/test/BUILD.gn
@@ -15,7 +15,7 @@
   source_dir = "dart"
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.input",
+    "//sdk/fidl/fuchsia.ui.input",
     "//topaz/lib/shell",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/settings/BUILD.gn b/lib/settings/BUILD.gn
index c3cfeab..f98c7f2 100644
--- a/lib/settings/BUILD.gn
+++ b/lib/settings/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.devicesettings",
+    "//sdk/fidl/fuchsia.devicesettings",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/widgets:lib.widgets",
   ]
diff --git a/lib/setui/settings/client/BUILD.gn b/lib/setui/settings/client/BUILD.gn
index 3a3d20f..d39c50f 100644
--- a/lib/setui/settings/client/BUILD.gn
+++ b/lib/setui/settings/client/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
     "//topaz/lib/setui/common:common",
     "//topaz/lib/setui/flutter:flutter",
     "//topaz/lib/setui/settings/common:common",
@@ -30,7 +30,7 @@
 
   deps = [
     ":client",
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
diff --git a/lib/setui/settings/common/BUILD.gn b/lib/setui/settings/common/BUILD.gn
index 96af10d..82d9c46 100644
--- a/lib/setui/settings/common/BUILD.gn
+++ b/lib/setui/settings/common/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
     "//topaz/lib/setui/common:common",
     "//topaz/lib/setui/flutter:flutter",
     "//topaz/lib/setui/settings/json:fuchsia.setui.json",
@@ -31,7 +31,7 @@
 
   deps = [
     ":common",
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
diff --git a/lib/setui/settings/json/BUILD.gn b/lib/setui/settings/json/BUILD.gn
index b5bf4ac..4aad7b5 100644
--- a/lib/setui/settings/json/BUILD.gn
+++ b/lib/setui/settings/json/BUILD.gn
@@ -6,9 +6,9 @@
 import("//topaz/runtime/dart/dart_test.gni")
 
 json_fidl("fuchsia.setui.json") {
-  fidl_target = "$garnet_sdk_fidl/fuchsia.setui"
+  fidl_target = "//sdk/fidl/fuchsia.setui"
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
   ]
 }
diff --git a/lib/setui/settings/service/BUILD.gn b/lib/setui/settings/service/BUILD.gn
index bd1bc87..a44893d 100644
--- a/lib/setui/settings/service/BUILD.gn
+++ b/lib/setui/settings/service/BUILD.gn
@@ -13,10 +13,10 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.netstack",
-    "$garnet_sdk_fidl/fuchsia.setui",
-    "$garnet_sdk_fidl/fuchsia.timezone",
-    "$garnet_sdk_fidl/fuchsia.wlan.service",
+    "//sdk/fidl/fuchsia.netstack",
+    "//sdk/fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.timezone",
+    "//sdk/fidl/fuchsia.wlan.service",
     "//topaz/lib/settings:lib.settings",
     "//topaz/lib/setui/settings/common:common",
     "//topaz/public/dart/fidl",
diff --git a/lib/setui/settings/testing/BUILD.gn b/lib/setui/settings/testing/BUILD.gn
index 6360710..0e34168 100644
--- a/lib/setui/settings/testing/BUILD.gn
+++ b/lib/setui/settings/testing/BUILD.gn
@@ -13,7 +13,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
     "//topaz/lib/setui/settings/client:client",
     "//topaz/lib/setui/settings/common:common",
   ]
@@ -26,7 +26,7 @@
 
   deps = [
     ":testing",
-    "$garnet_sdk_fidl/fuchsia.setui",
+    "//sdk/fidl/fuchsia.setui",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/test",
     "//topaz/lib/setui/settings/common:common",
diff --git a/lib/story_shell/BUILD.gn b/lib/story_shell/BUILD.gn
index 79e922f..52c9459 100644
--- a/lib/story_shell/BUILD.gn
+++ b/lib/story_shell/BUILD.gn
@@ -13,7 +13,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/dart/widgets:lib.widgets",
diff --git a/lib/story_shell/examples/example_manual_relationships/BUILD.gn b/lib/story_shell/examples/example_manual_relationships/BUILD.gn
index 47bdd25..5af994b 100644
--- a/lib/story_shell/examples/example_manual_relationships/BUILD.gn
+++ b/lib/story_shell/examples/example_manual_relationships/BUILD.gn
@@ -23,8 +23,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
diff --git a/lib/story_shell/examples/story_shell_test/BUILD.gn b/lib/story_shell/examples/story_shell_test/BUILD.gn
index eae3d88..d903210 100644
--- a/lib/story_shell/examples/story_shell_test/BUILD.gn
+++ b/lib/story_shell/examples/story_shell_test/BUILD.gn
@@ -16,7 +16,7 @@
   package_only = true
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
     "//topaz/lib/story_shell:lib.story_shell",
diff --git a/lib/xi/fuchsia_client/BUILD.gn b/lib/xi/fuchsia_client/BUILD.gn
index 55d5b92..98f94c2 100644
--- a/lib/xi/fuchsia_client/BUILD.gn
+++ b/lib/xi/fuchsia_client/BUILD.gn
@@ -14,8 +14,8 @@
 
   deps = [
     "../client:xi_client",
-    "$garnet_sdk_fidl/fuchsia.xi",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.xi",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
diff --git a/lib/xi/widgets/lib/src/key_info.dart b/lib/xi/widgets/lib/src/key_info.dart
index bb763c2..433454e 100644
--- a/lib/xi/widgets/lib/src/key_info.dart
+++ b/lib/xi/widgets/lib/src/key_info.dart
@@ -56,7 +56,7 @@
   static const int _metaCtrlRightOn = 0x4000;
 
   // Fuchsia modifier values. See:
-  // $garnet_sdk_fidl/fuchsia.ui.input/input_event_constants.fidl
+  // //sdk/fidl/fuchsia.ui.input/input_event_constants.fidl
   static const int _modifierShiftLeft = 2;
   static const int _modifierShiftRight = 4;
   static const int _modifierShiftMask = 6;
diff --git a/public/dart-pkg/fuchsia/BUILD.gn b/public/dart-pkg/fuchsia/BUILD.gn
index f7468ce..883cf07 100644
--- a/public/dart-pkg/fuchsia/BUILD.gn
+++ b/public/dart-pkg/fuchsia/BUILD.gn
@@ -26,7 +26,7 @@
   ]
 
   public_deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//third_party/tonic",
     "//topaz/public/dart-pkg/zircon",
   ]
diff --git a/public/dart/fuchsia_media/BUILD.gn b/public/dart/fuchsia_media/BUILD.gn
index 8993ff5..c2a4e0c 100644
--- a/public/dart/fuchsia_media/BUILD.gn
+++ b/public/dart/fuchsia_media/BUILD.gn
@@ -18,6 +18,6 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.media",
+    "//sdk/fidl/fuchsia.media",
   ]
 }
diff --git a/public/dart/fuchsia_modular/BUILD.gn b/public/dart/fuchsia_modular/BUILD.gn
index d0bd70c..a16b32d 100644
--- a/public/dart/fuchsia_modular/BUILD.gn
+++ b/public/dart/fuchsia_modular/BUILD.gn
@@ -50,10 +50,10 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
-    "$garnet_sdk_fidl/fuchsia.sys",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.ui.viewsv1token",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/async",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/dart/fidl",
diff --git a/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn b/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
index 0e0cb14..bb04ff8 100644
--- a/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
+++ b/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
@@ -27,7 +27,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.testing.runner",
+    "//sdk/fidl/fuchsia.testing.runner",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_modular/examples/fidl:fibonacci_service",
diff --git a/public/dart/fuchsia_scenic/BUILD.gn b/public/dart/fuchsia_scenic/BUILD.gn
index be37d2f..f83a9ea 100644
--- a/public/dart/fuchsia_scenic/BUILD.gn
+++ b/public/dart/fuchsia_scenic/BUILD.gn
@@ -18,8 +18,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.gfx",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.scenic",
     "//topaz/public/dart/zircon",
   ]
 }
diff --git a/public/dart/fuchsia_scenic_flutter/BUILD.gn b/public/dart/fuchsia_scenic_flutter/BUILD.gn
index 502dbfb..c4c88bd 100644
--- a/public/dart/fuchsia_scenic_flutter/BUILD.gn
+++ b/public/dart/fuchsia_scenic_flutter/BUILD.gn
@@ -24,10 +24,10 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.math",
-    "$garnet_sdk_fidl/fuchsia.sys",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token",
+    "//sdk/fidl/fuchsia.math",
+    "//sdk/fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.viewsv1token",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/dart/fidl",
diff --git a/public/dart/fuchsia_services/BUILD.gn b/public/dart/fuchsia_services/BUILD.gn
index 63b38ac..2a55a73 100644
--- a/public/dart/fuchsia_services/BUILD.gn
+++ b/public/dart/fuchsia_services/BUILD.gn
@@ -22,7 +22,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
diff --git a/public/dart/sledge/BUILD.gn b/public/dart/sledge/BUILD.gn
index d5e3f3a..99461c1 100644
--- a/public/dart/sledge/BUILD.gn
+++ b/public/dart/sledge/BUILD.gn
@@ -51,7 +51,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.ledger",
+    "//sdk/fidl/fuchsia.ledger",
     "//third_party/dart-pkg/pub/collection",
     "//third_party/dart-pkg/pub/crypto",
     "//topaz/public/lib/module/dart",
diff --git a/public/dart/widgets/BUILD.gn b/public/dart/widgets/BUILD.gn
index 84ee57f..6376283 100644
--- a/public/dart/widgets/BUILD.gn
+++ b/public/dart/widgets/BUILD.gn
@@ -30,9 +30,9 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.policy",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.policy",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/flutter_image",
     "//topaz/bin/ui/skottie_viewer:skottie_loader",
diff --git a/public/lib/agent/dart/BUILD.gn b/public/lib/agent/dart/BUILD.gn
index 32ece27..d9be8bd 100644
--- a/public/lib/agent/dart/BUILD.gn
+++ b/public/lib/agent/dart/BUILD.gn
@@ -13,8 +13,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/app/dart/BUILD.gn b/public/lib/app/dart/BUILD.gn
index 74f78fd..1a259ee 100644
--- a/public/lib/app/dart/BUILD.gn
+++ b/public/lib/app/dart/BUILD.gn
@@ -23,7 +23,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/logging",
     "//third_party/dart-pkg/pub/stack_trace",
     "//topaz/public/dart/fidl",
diff --git a/public/lib/app_driver/dart/BUILD.gn b/public/lib/app_driver/dart/BUILD.gn
index faf2d93..6830d2e 100644
--- a/public/lib/app_driver/dart/BUILD.gn
+++ b/public/lib/app_driver/dart/BUILD.gn
@@ -29,7 +29,7 @@
 
   deps = [
     ":modules_metrics_registry_dartlib",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/component/dart",
     "//topaz/public/lib/entity/dart",
diff --git a/public/lib/component/dart/BUILD.gn b/public/lib/component/dart/BUILD.gn
index 7e4eda2..f40fa78 100644
--- a/public/lib/component/dart/BUILD.gn
+++ b/public/lib/component/dart/BUILD.gn
@@ -15,7 +15,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/zircon",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/context/dart/BUILD.gn b/public/lib/context/dart/BUILD.gn
index f889b30..b459111 100644
--- a/public/lib/context/dart/BUILD.gn
+++ b/public/lib/context/dart/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/device/dart/BUILD.gn b/public/lib/device/dart/BUILD.gn
index e6ece0c..d7ee2c5 100644
--- a/public/lib/device/dart/BUILD.gn
+++ b/public/lib/device/dart/BUILD.gn
@@ -15,8 +15,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.auth",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.auth",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/display/dart/BUILD.gn b/public/lib/display/dart/BUILD.gn
index cc69612..7416ec1 100644
--- a/public/lib/display/dart/BUILD.gn
+++ b/public/lib/display/dart/BUILD.gn
@@ -12,8 +12,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.device.display",
-    "$garnet_sdk_fidl/fuchsia.devicesettings",
+    "//sdk/fidl/fuchsia.device.display",
+    "//sdk/fidl/fuchsia.devicesettings",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/entity/dart/BUILD.gn b/public/lib/entity/dart/BUILD.gn
index 6114cec..a0aa619 100644
--- a/public/lib/entity/dart/BUILD.gn
+++ b/public/lib/entity/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/json_schema",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/intent_handler/dart/BUILD.gn b/public/lib/intent_handler/dart/BUILD.gn
index fa21f8d..2aa6af3 100644
--- a/public/lib/intent_handler/dart/BUILD.gn
+++ b/public/lib/intent_handler/dart/BUILD.gn
@@ -15,7 +15,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/lifecycle/dart/BUILD.gn b/public/lib/lifecycle/dart/BUILD.gn
index ee10c25..6f0bb34 100644
--- a/public/lib/lifecycle/dart/BUILD.gn
+++ b/public/lib/lifecycle/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
   ]
diff --git a/public/lib/media/dart/BUILD.gn b/public/lib/media/dart/BUILD.gn
index da359c2..835af20 100644
--- a/public/lib/media/dart/BUILD.gn
+++ b/public/lib/media/dart/BUILD.gn
@@ -15,7 +15,7 @@
   source_dir = "."
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.media",
+    "//sdk/fidl/fuchsia.media",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_logger",
     "//topaz/public/dart/fuchsia_services",
diff --git a/public/lib/mediaplayer/dart/BUILD.gn b/public/lib/mediaplayer/dart/BUILD.gn
index 73dd101..abbb8bf 100644
--- a/public/lib/mediaplayer/dart/BUILD.gn
+++ b/public/lib/mediaplayer/dart/BUILD.gn
@@ -15,11 +15,11 @@
   source_dir = "."
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.device.display",
-    "$garnet_sdk_fidl/fuchsia.math",
-    "$garnet_sdk_fidl/fuchsia.media",
-    "$garnet_sdk_fidl/fuchsia.mediaplayer",
-    "$garnet_sdk_fidl/fuchsia.net.oldhttp",
+    "//sdk/fidl/fuchsia.device.display",
+    "//sdk/fidl/fuchsia.math",
+    "//sdk/fidl/fuchsia.media",
+    "//sdk/fidl/fuchsia.mediaplayer",
+    "//sdk/fidl/fuchsia.net.oldhttp",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
     "//topaz/public/lib/settings:settings_protos",
diff --git a/public/lib/mediaplayer/flutter/BUILD.gn b/public/lib/mediaplayer/flutter/BUILD.gn
index 6098842..724d7d3 100644
--- a/public/lib/mediaplayer/flutter/BUILD.gn
+++ b/public/lib/mediaplayer/flutter/BUILD.gn
@@ -16,8 +16,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.media",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.media",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//topaz/public/dart/fuchsia_scenic_flutter",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/module/dart/BUILD.gn b/public/lib/module/dart/BUILD.gn
index d42e60c..ac655a6 100644
--- a/public/lib/module/dart/BUILD.gn
+++ b/public/lib/module/dart/BUILD.gn
@@ -16,8 +16,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/module_resolver/dart/BUILD.gn b/public/lib/module_resolver/dart/BUILD.gn
index b374db1..899ce14 100644
--- a/public/lib/module_resolver/dart/BUILD.gn
+++ b/public/lib/module_resolver/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/proposal/dart/BUILD.gn b/public/lib/proposal/dart/BUILD.gn
index ce71450..29a34ee 100644
--- a/public/lib/proposal/dart/BUILD.gn
+++ b/public/lib/proposal/dart/BUILD.gn
@@ -14,7 +14,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/pub/http",
     "//topaz/public/dart/zircon",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/settings/BUILD.gn b/public/lib/settings/BUILD.gn
index 42ced87..0c68b0a 100644
--- a/public/lib/settings/BUILD.gn
+++ b/public/lib/settings/BUILD.gn
@@ -20,7 +20,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.devicesettings",
+    "//sdk/fidl/fuchsia.devicesettings",
     "//third_party/dart-pkg/pub/protobuf",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia_services",
diff --git a/public/lib/story/dart/BUILD.gn b/public/lib/story/dart/BUILD.gn
index 9e6e2ed..92bfab5 100644
--- a/public/lib/story/dart/BUILD.gn
+++ b/public/lib/story/dart/BUILD.gn
@@ -17,7 +17,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/ui/flutter/BUILD.gn b/public/lib/ui/flutter/BUILD.gn
index 6b972c0..0a3851c 100644
--- a/public/lib/ui/flutter/BUILD.gn
+++ b/public/lib/ui/flutter/BUILD.gn
@@ -17,9 +17,9 @@
   source_dir = "."
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.math",
-    "$garnet_sdk_fidl/fuchsia.ui.app",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.math",
+    "//sdk/fidl/fuchsia.ui.app",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/meta",
     "//topaz/public/lib/app/dart",
diff --git a/public/lib/ui/flutter/sdk_ext/BUILD.gn b/public/lib/ui/flutter/sdk_ext/BUILD.gn
index 68af3a4..c1eda08 100644
--- a/public/lib/ui/flutter/sdk_ext/BUILD.gn
+++ b/public/lib/ui/flutter/sdk_ext/BUILD.gn
@@ -9,7 +9,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/fxl",
     "//third_party/dart/runtime:dart_api",
     "//third_party/tonic",
diff --git a/public/lib/ui/scenic/dart/BUILD.gn b/public/lib/ui/scenic/dart/BUILD.gn
index 41137a8..f9bc5f0 100644
--- a/public/lib/ui/scenic/dart/BUILD.gn
+++ b/public/lib/ui/scenic/dart/BUILD.gn
@@ -16,8 +16,8 @@
   source_dir = "."
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.gfx",
-    "$garnet_sdk_fidl/fuchsia.ui.scenic",
+    "//sdk/fidl/fuchsia.ui.gfx",
+    "//sdk/fidl/fuchsia.ui.scenic",
     "//topaz/public/lib/app/dart",
   ]
 }
diff --git a/public/lib/user/dart/BUILD.gn b/public/lib/user/dart/BUILD.gn
index ab9928c..d40cb87 100644
--- a/public/lib/user/dart/BUILD.gn
+++ b/public/lib/user/dart/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//topaz/public/dart/fidl",
     "//topaz/public/dart/fuchsia",
     "//topaz/public/lib/app/dart",
diff --git a/runtime/chromium/BUILD.gn b/runtime/chromium/BUILD.gn
index 0f713ba..3aee611 100644
--- a/runtime/chromium/BUILD.gn
+++ b/runtime/chromium/BUILD.gn
@@ -11,8 +11,8 @@
   sources = chromium_web_sources
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1token",
+    "//sdk/fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.ui.viewsv1token",
   ]
 }
 
diff --git a/runtime/dart/dart_component.gni b/runtime/dart/dart_component.gni
index 52639d2..8dede5c 100644
--- a/runtime/dart/dart_component.gni
+++ b/runtime/dart/dart_component.gni
@@ -413,8 +413,8 @@
 
       if (flutter_driver_extendable) {
         deps += [
-          "$garnet_sdk_fidl/fuchsia.testing.runner",
-          "$peridot_sdk_fidl/fuchsia.modular",
+          "//sdk/fidl/fuchsia.testing.runner",
+          "//sdk/fidl/fuchsia.modular",
           "//third_party/dart-pkg/git/flutter/packages/flutter_driver",
           "//topaz/public/lib/app/dart",
           "//topaz/public/lib/module/dart",
diff --git a/runtime/dart_runner/embedder/script_runner_snapshot.dart b/runtime/dart_runner/embedder/script_runner_snapshot.dart
index c7aa96c..9a2ff32 100644
--- a/runtime/dart_runner/embedder/script_runner_snapshot.dart
+++ b/runtime/dart_runner/embedder/script_runner_snapshot.dart
@@ -27,5 +27,5 @@
 import 'package:lib.app.dart/app.dart';
 import 'package:fidl/fidl.dart';
 
-// From $peridot_sdk_fidl/fuchsia.modular
+// From //sdk/fidl/fuchsia.modular
 import 'package:fidl_fuchsia_modular/fidl.dart';
diff --git a/runtime/flutter_runner/BUILD.gn b/runtime/flutter_runner/BUILD.gn
index 11a577a..1b73419 100644
--- a/runtime/flutter_runner/BUILD.gn
+++ b/runtime/flutter_runner/BUILD.gn
@@ -124,11 +124,11 @@
     ]
 
     deps = [
-             "$garnet_sdk_fidl/fuchsia.accessibility",
-             "$garnet_sdk_fidl/fuchsia.fonts",
-             "$garnet_sdk_fidl/fuchsia.ui.app",
-             "$garnet_sdk_fidl/fuchsia.ui.input",
-             "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
+             "//sdk/fidl/fuchsia.accessibility",
+             "//sdk/fidl/fuchsia.fonts",
+             "//sdk/fidl/fuchsia.ui.app",
+             "//sdk/fidl/fuchsia.ui.input",
+             "//sdk/fidl/fuchsia.ui.viewsv1",
              "//garnet/public/lib/component/cpp",
              "//garnet/public/lib/fsl",
              "//garnet/public/lib/fxl",
@@ -137,7 +137,7 @@
              "//garnet/public/lib/ui/gfx/cpp",
              "//garnet/public/lib/ui/scenic/cpp",
              "//garnet/public/lib/vulkan",
-             "$peridot_sdk_fidl/fuchsia.modular",
+             "//sdk/fidl/fuchsia.modular",
              "//third_party/dart/runtime/bin:libdart_builtin${product_suffix}",
              "//third_party/rapidjson",
              "//third_party/skia",
@@ -354,7 +354,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.fonts",
+    "//sdk/fidl/fuchsia.fonts",
     "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/component/cpp/testing",
     "//garnet/public/lib/fsl",
diff --git a/shell/mondrian_story_shell/BUILD.gn b/shell/mondrian_story_shell/BUILD.gn
index b61ae66..6d734a1 100644
--- a/shell/mondrian_story_shell/BUILD.gn
+++ b/shell/mondrian_story_shell/BUILD.gn
@@ -45,8 +45,8 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.ui.viewsv1",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.ui.viewsv1",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter",
     "//third_party/dart-pkg/pub/meta",
     "//third_party/dart-pkg/pub/quiver",
@@ -72,7 +72,7 @@
 
   deps = [
     ":mondrian_dart_library",
-    "$peridot_sdk_fidl/fuchsia.modular",
+    "//sdk/fidl/fuchsia.modular",
     "//third_party/dart-pkg/git/flutter/packages/flutter_test",
     "//third_party/dart-pkg/pub/mockito",
     "//third_party/dart-pkg/pub/test",
diff --git a/tests/dart_app_service_tests/BUILD.gn b/tests/dart_app_service_tests/BUILD.gn
index 224b21c..f22c1ae 100644
--- a/tests/dart_app_service_tests/BUILD.gn
+++ b/tests/dart_app_service_tests/BUILD.gn
@@ -18,7 +18,7 @@
 
   deps = [
     "//garnet/examples/fidl/services:echo2",
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//third_party/dart-pkg/pub/test",
     "//topaz/public/dart/fidl",
     "//topaz/public/lib/app/dart",
diff --git a/tests/web_runner_smoke_tests/BUILD.gn b/tests/web_runner_smoke_tests/BUILD.gn
index 3ae8930..e2f5cbd 100644
--- a/tests/web_runner_smoke_tests/BUILD.gn
+++ b/tests/web_runner_smoke_tests/BUILD.gn
@@ -16,7 +16,7 @@
   ]
 
   deps = [
-    "$garnet_sdk_fidl/fuchsia.sys",
+    "//sdk/fidl/fuchsia.sys",
     "//garnet/public/lib/component/cpp/testing",
     "//garnet/public/lib/fxl",
     "//third_party/googletest:gtest_main",