[fidl] Access dart bindings through *_dart subtarget
See fxrev.dev/731564, for which this is the next step in the soft
transition.
Change-Id: I7a194154b3cc7236f9b1c9b604bbcbe0cdf138b7
Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/731523
Reviewed-by: Mitchell Kember <mkember@google.com>
Commit-Queue: Joshua Seaton <joshuaseaton@google.com>
diff --git a/session_shells/ermine/fidl/BUILD.gn b/session_shells/ermine/fidl/BUILD.gn
index 4b07a13..92c1c93 100644
--- a/session_shells/ermine/fidl/BUILD.gn
+++ b/session_shells/ermine/fidl/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/fidl/fidl.gni")
group("fidl") {
- public_deps = [ ":ermine.tools" ]
+ public_deps = [ ":ermine.tools_dart($dart_toolchain)" ]
}
fidl("ermine.tools") {
diff --git a/session_shells/ermine/keyboard_shortcuts/BUILD.gn b/session_shells/ermine/keyboard_shortcuts/BUILD.gn
index 9fc739f..85c40a4 100644
--- a/session_shells/ermine/keyboard_shortcuts/BUILD.gn
+++ b/session_shells/ermine/keyboard_shortcuts/BUILD.gn
@@ -17,9 +17,9 @@
deps = [
"//sdk/dart/fuchsia_services",
"//sdk/dart/zircon",
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.shortcut",
- "//sdk/fidl/fuchsia.ui.views",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.shortcut:fuchsia.ui.shortcut_dart",
+ "//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views_dart",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//third_party/dart-pkg/pub/meta",
]
@@ -34,9 +34,9 @@
":keyboard_shortcuts",
"//sdk/dart/fidl",
"//sdk/dart/zircon",
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.shortcut",
- "//sdk/fidl/fuchsia.ui.views",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.shortcut:fuchsia.ui.shortcut_dart",
+ "//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views_dart",
"//third_party/dart-pkg/git/flutter/packages/flutter_test",
"//third_party/dart-pkg/pub/mockito",
"//third_party/dart-pkg/pub/test",
diff --git a/session_shells/ermine/login/BUILD.gn b/session_shells/ermine/login/BUILD.gn
index 94ad24b..3a658a8 100644
--- a/session_shells/ermine/login/BUILD.gn
+++ b/session_shells/ermine/login/BUILD.gn
@@ -63,24 +63,24 @@
"//sdk/dart/fuchsia_services",
"//sdk/dart/fuchsia_vfs",
"//sdk/dart/zircon",
- "//sdk/fidl/fuchsia.component",
- "//sdk/fidl/fuchsia.component.decl",
- "//sdk/fidl/fuchsia.element",
- "//sdk/fidl/fuchsia.feedback",
- "//sdk/fidl/fuchsia.hardware.power.statecontrol",
- "//sdk/fidl/fuchsia.identity.account",
- "//sdk/fidl/fuchsia.intl",
- "//sdk/fidl/fuchsia.io",
- "//sdk/fidl/fuchsia.mem",
- "//sdk/fidl/fuchsia.recovery",
- "//sdk/fidl/fuchsia.settings",
- "//sdk/fidl/fuchsia.ssh",
- "//sdk/fidl/fuchsia.sys",
- "//sdk/fidl/fuchsia.ui.app",
- "//sdk/fidl/fuchsia.ui.focus",
- "//sdk/fidl/fuchsia.ui.scenic",
- "//sdk/fidl/fuchsia.ui.views",
- "//sdk/fidl/fuchsia.update.channelcontrol",
+ "//sdk/fidl/fuchsia.component:fuchsia.component_dart",
+ "//sdk/fidl/fuchsia.component.decl:fuchsia.component.decl_dart",
+ "//sdk/fidl/fuchsia.element:fuchsia.element_dart",
+ "//sdk/fidl/fuchsia.feedback:fuchsia.feedback_dart",
+ "//sdk/fidl/fuchsia.hardware.power.statecontrol:fuchsia.hardware.power.statecontrol_dart",
+ "//sdk/fidl/fuchsia.identity.account:fuchsia.identity.account_dart",
+ "//sdk/fidl/fuchsia.intl:fuchsia.intl_dart",
+ "//sdk/fidl/fuchsia.io:fuchsia.io_dart",
+ "//sdk/fidl/fuchsia.mem:fuchsia.mem_dart",
+ "//sdk/fidl/fuchsia.recovery:fuchsia.recovery_dart",
+ "//sdk/fidl/fuchsia.settings:fuchsia.settings_dart",
+ "//sdk/fidl/fuchsia.ssh:fuchsia.ssh_dart",
+ "//sdk/fidl/fuchsia.sys:fuchsia.sys_dart",
+ "//sdk/fidl/fuchsia.ui.app:fuchsia.ui.app_dart",
+ "//sdk/fidl/fuchsia.ui.focus:fuchsia.ui.focus_dart",
+ "//sdk/fidl/fuchsia.ui.scenic:fuchsia.ui.scenic_dart",
+ "//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views_dart",
+ "//sdk/fidl/fuchsia.update.channelcontrol:fuchsia.update.channelcontrol_dart",
"//src/experiences/session_shells/ermine/fidl",
"//src/experiences/session_shells/ermine/internationalization",
"//src/experiences/session_shells/ermine/utils:ermine_utils",
diff --git a/session_shells/ermine/session/BUILD.gn b/session_shells/ermine/session/BUILD.gn
index 8583e34..928735a 100644
--- a/session_shells/ermine/session/BUILD.gn
+++ b/session_shells/ermine/session/BUILD.gn
@@ -18,13 +18,13 @@
"//sdk/dart/fuchsia_services",
"//sdk/dart/fuchsia_vfs",
"//sdk/dart/zircon",
- "//sdk/fidl/fuchsia.component",
- "//sdk/fidl/fuchsia.component.decl",
- "//sdk/fidl/fuchsia.io",
- "//sdk/fidl/fuchsia.session.scene",
- "//sdk/fidl/fuchsia.ui.app",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.views",
+ "//sdk/fidl/fuchsia.component:fuchsia.component_dart",
+ "//sdk/fidl/fuchsia.component.decl:fuchsia.component.decl_dart",
+ "//sdk/fidl/fuchsia.io:fuchsia.io_dart",
+ "//sdk/fidl/fuchsia.session.scene:fuchsia.session.scene_dart",
+ "//sdk/fidl/fuchsia.ui.app:fuchsia.ui.app_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views_dart",
]
}
diff --git a/session_shells/ermine/shell/BUILD.gn b/session_shells/ermine/shell/BUILD.gn
index 74cee4f..160cf2f 100644
--- a/session_shells/ermine/shell/BUILD.gn
+++ b/session_shells/ermine/shell/BUILD.gn
@@ -100,31 +100,31 @@
"//sdk/dart/fuchsia_scenic_flutter",
"//sdk/dart/fuchsia_services",
"//sdk/dart/zircon",
- "//sdk/fidl/fuchsia.buildinfo",
- "//sdk/fidl/fuchsia.element",
- "//sdk/fidl/fuchsia.feedback",
- "//sdk/fidl/fuchsia.hardware.power.statecontrol",
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.intl",
- "//sdk/fidl/fuchsia.media",
- "//sdk/fidl/fuchsia.media.audio",
- "//sdk/fidl/fuchsia.memory",
- "//sdk/fidl/fuchsia.net.interfaces",
- "//sdk/fidl/fuchsia.power.battery",
- "//sdk/fidl/fuchsia.power.button",
- "//sdk/fidl/fuchsia.settings",
- "//sdk/fidl/fuchsia.ssh",
- "//sdk/fidl/fuchsia.ui.activity",
- "//sdk/fidl/fuchsia.ui.app",
- "//sdk/fidl/fuchsia.ui.brightness",
- "//sdk/fidl/fuchsia.ui.focus",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.shortcut",
- "//sdk/fidl/fuchsia.ui.views",
- "//sdk/fidl/fuchsia.update",
- "//sdk/fidl/fuchsia.update.channelcontrol",
- "//sdk/fidl/fuchsia.wlan.common",
- "//sdk/fidl/fuchsia.wlan.policy",
+ "//sdk/fidl/fuchsia.buildinfo:fuchsia.buildinfo_dart",
+ "//sdk/fidl/fuchsia.element:fuchsia.element_dart",
+ "//sdk/fidl/fuchsia.feedback:fuchsia.feedback_dart",
+ "//sdk/fidl/fuchsia.hardware.power.statecontrol:fuchsia.hardware.power.statecontrol_dart",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.intl:fuchsia.intl_dart",
+ "//sdk/fidl/fuchsia.media:fuchsia.media_dart",
+ "//sdk/fidl/fuchsia.media.audio:fuchsia.media.audio_dart",
+ "//sdk/fidl/fuchsia.memory:fuchsia.memory_dart",
+ "//sdk/fidl/fuchsia.net.interfaces:fuchsia.net.interfaces_dart",
+ "//sdk/fidl/fuchsia.power.battery:fuchsia.power.battery_dart",
+ "//sdk/fidl/fuchsia.power.button:fuchsia.power.button_dart",
+ "//sdk/fidl/fuchsia.settings:fuchsia.settings_dart",
+ "//sdk/fidl/fuchsia.ssh:fuchsia.ssh_dart",
+ "//sdk/fidl/fuchsia.ui.activity:fuchsia.ui.activity_dart",
+ "//sdk/fidl/fuchsia.ui.app:fuchsia.ui.app_dart",
+ "//sdk/fidl/fuchsia.ui.brightness:fuchsia.ui.brightness_dart",
+ "//sdk/fidl/fuchsia.ui.focus:fuchsia.ui.focus_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.shortcut:fuchsia.ui.shortcut_dart",
+ "//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views_dart",
+ "//sdk/fidl/fuchsia.update:fuchsia.update_dart",
+ "//sdk/fidl/fuchsia.update.channelcontrol:fuchsia.update.channelcontrol_dart",
+ "//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common_dart",
+ "//sdk/fidl/fuchsia.wlan.policy:fuchsia.wlan.policy_dart",
"//src/experiences/session_shells/ermine/fidl",
"//src/experiences/session_shells/ermine/internationalization",
"//src/experiences/session_shells/ermine/keyboard_shortcuts",
diff --git a/session_shells/ermine/utils/BUILD.gn b/session_shells/ermine/utils/BUILD.gn
index 6134b1e..b32cf83 100644
--- a/session_shells/ermine/utils/BUILD.gn
+++ b/session_shells/ermine/utils/BUILD.gn
@@ -29,9 +29,9 @@
"//sdk/dart/fuchsia_scenic_flutter",
"//sdk/dart/fuchsia_services",
"//sdk/dart/zircon",
- "//sdk/fidl/fuchsia.feedback",
- "//sdk/fidl/fuchsia.mem",
- "//sdk/fidl/fuchsia.ui.views",
+ "//sdk/fidl/fuchsia.feedback:fuchsia.feedback_dart",
+ "//sdk/fidl/fuchsia.mem:fuchsia.mem_dart",
+ "//sdk/fidl/fuchsia.ui.views:fuchsia.ui.views_dart",
"//src/experiences/session_shells/ermine/internationalization",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//third_party/dart-pkg/pub/flutter_mobx",
diff --git a/tests/BUILD.gn b/tests/BUILD.gn
index f1424e3..4ce3d93 100644
--- a/tests/BUILD.gn
+++ b/tests/BUILD.gn
@@ -14,9 +14,9 @@
sources = [ "ermine_driver.dart" ]
deps = [
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.input3",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//third_party/dart-pkg/git/flutter/packages/flutter_driver",
diff --git a/tests/chrome/BUILD.gn b/tests/chrome/BUILD.gn
index 9c8298e..5ebe014 100644
--- a/tests/chrome/BUILD.gn
+++ b/tests/chrome/BUILD.gn
@@ -20,7 +20,7 @@
deps = [
"//sdk/dart/fuchsia_logger",
- "//sdk/fidl/fuchsia.input",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//src/experiences/tests:ermine_driver",
@@ -52,7 +52,7 @@
deps = [
"//sdk/dart/fuchsia_logger",
- "//sdk/fidl/fuchsia.input",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//src/experiences/tests:ermine_driver",
diff --git a/tests/e2e/BUILD.gn b/tests/e2e/BUILD.gn
index b42fa7e..e27411b 100644
--- a/tests/e2e/BUILD.gn
+++ b/tests/e2e/BUILD.gn
@@ -32,9 +32,9 @@
]
deps = [
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.input3",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//src/experiences/tests:ermine_driver",
@@ -70,9 +70,9 @@
sources = [ "ermine_terminal_test.dart" ]
deps = [
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.input3",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//src/experiences/tests:ermine_driver",
@@ -107,9 +107,9 @@
sources = [ "ermine_smoke_test.dart" ]
deps = [
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.input3",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//src/experiences/tests:ermine_driver",
diff --git a/tests/performance/BUILD.gn b/tests/performance/BUILD.gn
index 549d900..f81dd7c 100644
--- a/tests/performance/BUILD.gn
+++ b/tests/performance/BUILD.gn
@@ -22,9 +22,9 @@
sources = [ "workstation_performance_navigation_test.dart" ]
deps = [
- "//sdk/fidl/fuchsia.input",
- "//sdk/fidl/fuchsia.ui.input",
- "//sdk/fidl/fuchsia.ui.input3",
+ "//sdk/fidl/fuchsia.input:fuchsia.input_dart",
+ "//sdk/fidl/fuchsia.ui.input:fuchsia.ui.input_dart",
+ "//sdk/fidl/fuchsia.ui.input3:fuchsia.ui.input3_dart",
"//sdk/testing/sl4f/client",
"//sdk/testing/sl4f/flutter_driver_sl4f",
"//src/experiences/tests:ermine_driver",
