[inspect] Use Inspect from Zircon
TEST=runtests
CF-207: #done
Change-Id: Ib94f2e386d5aa9e16e943b63f0fc7acf6b0ea270
diff --git a/bin/iquery/BUILD.gn b/bin/iquery/BUILD.gn
index fadd774..a90ebd5 100644
--- a/bin/iquery/BUILD.gn
+++ b/bin/iquery/BUILD.gn
@@ -31,9 +31,9 @@
]
public_deps = [
- "//garnet/public/fidl/fuchsia.inspect",
"//garnet/public/lib/component/cpp",
"//garnet/public/lib/fostr",
+ "//zircon/public/fidl/fuchsia-inspect",
]
}
diff --git a/public/fidl/fuchsia.inspect/BUILD.gn b/public/fidl/fuchsia.inspect/BUILD.gn
deleted file mode 100644
index 277d42c..0000000
--- a/public/fidl/fuchsia.inspect/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.inspect") {
- sdk_category = "partner"
-
- sources = [
- "inspect.fidl",
- ]
-
- public_deps = [
- "//zircon/public/fidl/fuchsia-mem",
- ]
-}
diff --git a/public/fidl/fuchsia.inspect/inspect.fidl b/public/fidl/fuchsia.inspect/inspect.fidl
deleted file mode 100644
index 17d6ca9..0000000
--- a/public/fidl/fuchsia.inspect/inspect.fidl
+++ /dev/null
@@ -1,47 +0,0 @@
-// 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.
-
-library fuchsia.inspect;
-
-union PropertyValue {
- string str;
- vector<uint8> bytes;
-};
-
-// A string property on an |Object|. Consisting of a key and value.
-struct Property {
- string key;
- PropertyValue value;
-};
-
-// The value of a metric is one of these numeric types.
-union MetricValue {
- int64 int_value;
- uint64 uint_value;
- float64 double_value;
-};
-
-// A Metric is a string key and the associated numeric value.
-struct Metric {
- string key;
- MetricValue value;
-};
-
-// An |Object| has a name and 0 or more properties and metrics.
-struct Object {
- string name;
- vector<Property>? properties;
- vector<Metric>? metrics;
-};
-
-// The |Inspect| interface provides a point for Components to expose
-// structured Objects for inspection. An Object may have 0 or more children.
-[Discoverable]
-interface Inspect {
- 1: ReadData() -> (Object object);
- 2: ListChildren() -> (vector<string>? children_names);
- // Open a child of this Object by name.
- // The name should match what is returned by ListChildren.
- 3: OpenChild(string child_name, request<Inspect> child_channel) -> (bool success);
-};
diff --git a/public/lib/component/cpp/BUILD.gn b/public/lib/component/cpp/BUILD.gn
index 62ab4ac..8a599e3 100644
--- a/public/lib/component/cpp/BUILD.gn
+++ b/public/lib/component/cpp/BUILD.gn
@@ -27,11 +27,11 @@
]
public_deps = [
- "//garnet/public/fidl/fuchsia.inspect",
"//garnet/public/fidl/fuchsia.sys",
"//garnet/public/lib/fidl/cpp",
"//garnet/public/lib/fxl",
"//garnet/public/lib/svc/cpp",
+ "//zircon/public/fidl/fuchsia-inspect",
"//zircon/public/lib/fit",
"//zircon/public/lib/fs",
"//zircon/public/lib/zx",
diff --git a/public/rust/fuchsia-inspect/BUILD.gn b/public/rust/fuchsia-inspect/BUILD.gn
index 7e4cdd2..7060e9b 100644
--- a/public/rust/fuchsia-inspect/BUILD.gn
+++ b/public/rust/fuchsia-inspect/BUILD.gn
@@ -11,12 +11,12 @@
with_unit_tests = true
deps = [
- "//garnet/public/rust/fuchsia-syslog",
- "//garnet/public/fidl/fuchsia.inspect:fuchsia.inspect-rustc",
"//garnet/public/lib/fidl/rust/fidl",
"//garnet/public/rust/fuchsia-async",
+ "//garnet/public/rust/fuchsia-syslog",
"//third_party/rust-crates/rustc_deps:failure",
"//third_party/rust-crates/rustc_deps:futures-preview",
"//third_party/rust-crates/rustc_deps:parking_lot",
+ "//zircon/public/fidl/fuchsia-inspect:fuchsia-inspect-rustc",
]
}
