[guest] Move fuchsia.guest.* to //sdk/fidl
All (non-test) FIDL definitions should be in //sdk/fidl.
Test: Compiles.
Change-Id: I751097b2e8ed52c4130022972458bd2503b50722
diff --git a/garnet/bin/guest/manager/BUILD.gn b/garnet/bin/guest/manager/BUILD.gn
index 01909b2..40e6701 100644
--- a/garnet/bin/guest/manager/BUILD.gn
+++ b/garnet/bin/guest/manager/BUILD.gn
@@ -23,7 +23,7 @@
]
public_deps = [
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.vmm",
+ "//sdk/fidl/fuchsia.guest.vmm",
"//sdk/fidl/fuchsia.guest",
"//sdk/fidl/fuchsia.sys",
"//garnet/public/lib/component/cpp",
diff --git a/garnet/bin/guest/runner/BUILD.gn b/garnet/bin/guest/runner/BUILD.gn
index 6b8ba7d..c7f90b5 100644
--- a/garnet/bin/guest/runner/BUILD.gn
+++ b/garnet/bin/guest/runner/BUILD.gn
@@ -13,10 +13,10 @@
]
public_deps = [
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.vmm",
+ "//garnet/public/lib/component/cpp",
+ "//sdk/fidl/fuchsia.guest.vmm",
"//sdk/fidl/fuchsia.guest",
"//sdk/fidl/fuchsia.sys",
- "//garnet/public/lib/component/cpp",
"//zircon/public/lib/async-loop-cpp",
]
}
diff --git a/garnet/bin/guest/vmm/BUILD.gn b/garnet/bin/guest/vmm/BUILD.gn
index fad27b6..ad69e37 100644
--- a/garnet/bin/guest/vmm/BUILD.gn
+++ b/garnet/bin/guest/vmm/BUILD.gn
@@ -91,8 +91,8 @@
deps = [
"//garnet/bin/guest/third_party/fdt",
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.device",
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.vmm",
+ "//sdk/fidl/fuchsia.guest.device",
+ "//sdk/fidl/fuchsia.guest.vmm",
"//sdk/fidl/fuchsia.guest",
"//garnet/public/lib/fsl",
"//garnet/public/lib/ui/base_view/cpp",
diff --git a/garnet/bin/guest/vmm/device/BUILD.gn b/garnet/bin/guest/vmm/device/BUILD.gn
index 32dc7ed..822122d 100644
--- a/garnet/bin/guest/vmm/device/BUILD.gn
+++ b/garnet/bin/guest/vmm/device/BUILD.gn
@@ -16,8 +16,8 @@
]
defines = [ "_ALL_SOURCE=1" ]
public_deps = [
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.device",
"//garnet/public/lib/fxl",
+ "//sdk/fidl/fuchsia.guest.device",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/fit",
"//zircon/public/lib/virtio",
@@ -33,9 +33,9 @@
]
public_deps = [
":device",
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.device",
"//garnet/public/lib/component/cpp",
"//garnet/public/lib/fsl",
+ "//sdk/fidl/fuchsia.guest.device",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/trace-provider",
]
@@ -297,9 +297,9 @@
deps = [
":device",
- "//garnet/bin/guest/vmm/fidl:fuchsia.guest.device",
- "//sdk/fidl/fuchsia.netstack",
"//garnet/public/lib/component/cpp/testing",
+ "//sdk/fidl/fuchsia.guest.device",
+ "//sdk/fidl/fuchsia.netstack",
"//third_party/googletest:gtest_main",
"//zircon/public/lib/fzl",
"//zircon/public/lib/trace-provider",
diff --git a/garnet/bin/guest/vmm/fidl/BUILD.gn b/sdk/fidl/fuchsia.guest.device/BUILD.gn
similarity index 76%
rename from garnet/bin/guest/vmm/fidl/BUILD.gn
rename to sdk/fidl/fuchsia.guest.device/BUILD.gn
index 663a532..f1905a0 100644
--- a/garnet/bin/guest/vmm/fidl/BUILD.gn
+++ b/sdk/fidl/fuchsia.guest.device/BUILD.gn
@@ -16,13 +16,3 @@
"//zircon/public/fidl/fuchsia-io",
]
}
-
-fidl("fuchsia.guest.vmm") {
- sources = [
- "launch_info_provider.fidl",
- ]
-
- deps = [
- "//sdk/fidl/fuchsia.guest",
- ]
-}
diff --git a/garnet/bin/guest/vmm/fidl/device.fidl b/sdk/fidl/fuchsia.guest.device/device.fidl
similarity index 100%
rename from garnet/bin/guest/vmm/fidl/device.fidl
rename to sdk/fidl/fuchsia.guest.device/device.fidl
diff --git a/sdk/fidl/fuchsia.guest.vmm/BUILD.gn b/sdk/fidl/fuchsia.guest.vmm/BUILD.gn
new file mode 100644
index 0000000..e535c4f
--- /dev/null
+++ b/sdk/fidl/fuchsia.guest.vmm/BUILD.gn
@@ -0,0 +1,15 @@
+# Copyright 2018 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")
+
+fidl("fuchsia.guest.vmm") {
+ sources = [
+ "vmm.fidl",
+ ]
+
+ deps = [
+ "//sdk/fidl/fuchsia.guest",
+ ]
+}
diff --git a/garnet/bin/guest/vmm/fidl/launch_info_provider.fidl b/sdk/fidl/fuchsia.guest.vmm/vmm.fidl
similarity index 100%
rename from garnet/bin/guest/vmm/fidl/launch_info_provider.fidl
rename to sdk/fidl/fuchsia.guest.vmm/vmm.fidl
