[sdk][svc] Move libsvc.so into //sdk
Also, move the unit test out of the system image.
Test: Compiles.
Change-Id: I9e650453c023c29491c4321610527dc95fa0c42d
diff --git a/garnet/examples/fidl/echo2_server_c/BUILD.gn b/garnet/examples/fidl/echo2_server_c/BUILD.gn
index e665f2f..a50c958 100644
--- a/garnet/examples/fidl/echo2_server_c/BUILD.gn
+++ b/garnet/examples/fidl/echo2_server_c/BUILD.gn
@@ -12,7 +12,7 @@
]
deps = [
- "//garnet/public/lib/svc",
+ "//sdk/lib/svc",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/fdio",
]
diff --git a/garnet/packages/tests/svc b/garnet/packages/tests/svc
index 6f9c03d..d1c6b65 100644
--- a/garnet/packages/tests/svc
+++ b/garnet/packages/tests/svc
@@ -1,5 +1,5 @@
{
"packages": [
- "//garnet/public/lib/svc:package"
+ "//sdk/lib/svc:svc_tests"
]
}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index ad5c133..5b225e9 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -135,7 +135,7 @@
"//sdk/fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token_sdk($fidl_toolchain)",
"//sdk/fidl/fuchsia.wlan.service:fuchsia.wlan.service_sdk($fidl_toolchain)",
"//sdk/lib/fidl/cpp:cpp_sdk",
- "//garnet/public/lib/svc:svc_sdk",
+ "//sdk/lib/svc:svc_sdk",
"//sdk/lib/ui/scenic/cpp:cpp_sdk",
"//third_party/vulkan_loader_and_validation_layers/loader:loader_sdk",
"//zircon/public/fidl/fuchsia-cobalt:fuchsia-cobalt_sdk($fidl_toolchain)",
diff --git a/garnet/public/lib/svc/BUILD.gn b/sdk/lib/svc/BUILD.gn
similarity index 81%
rename from garnet/public/lib/svc/BUILD.gn
rename to sdk/lib/svc/BUILD.gn
index 1b95f37..b247284 100644
--- a/garnet/public/lib/svc/BUILD.gn
+++ b/sdk/lib/svc/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/cpp/sdk_shared_library.gni")
-import("//build/package.gni")
+import("//build/test/test_package.gni")
import("//build/test.gni")
sdk_shared_library("svc") {
@@ -23,9 +23,9 @@
"//zircon/public/lib/fs",
]
- include_base = "//garnet/public"
+ include_base = "//sdk"
- public_configs = [ "//garnet/public:config" ]
+ public_configs = [ "//sdk/config" ]
runtime_deps = [
"//zircon/public/lib/fdio:fdio_sdk",
@@ -47,12 +47,7 @@
]
}
-package("package") {
- testonly = true
- deprecated_system_image = true
-
- package_name = "svc"
-
+test_package("svc_tests") {
deps = [
":svc_unittests",
]
diff --git a/sdk/lib/svc/OWNERS b/sdk/lib/svc/OWNERS
new file mode 100644
index 0000000..676bae5
--- /dev/null
+++ b/sdk/lib/svc/OWNERS
@@ -0,0 +1,2 @@
+abarth@google.com
+jamesr@google.com
diff --git a/garnet/public/lib/svc/dir.cc b/sdk/lib/svc/dir.cc
similarity index 100%
rename from garnet/public/lib/svc/dir.cc
rename to sdk/lib/svc/dir.cc
diff --git a/garnet/public/lib/svc/dir.h b/sdk/lib/svc/dir.h
similarity index 100%
rename from garnet/public/lib/svc/dir.h
rename to sdk/lib/svc/dir.h
diff --git a/garnet/public/lib/svc/dir_unittest.cc b/sdk/lib/svc/dir_unittest.cc
similarity index 100%
rename from garnet/public/lib/svc/dir_unittest.cc
rename to sdk/lib/svc/dir_unittest.cc
diff --git a/sdk/lib/svc/meta/svc_unittests.cmx b/sdk/lib/svc/meta/svc_unittests.cmx
new file mode 100644
index 0000000..2670adb3
--- /dev/null
+++ b/sdk/lib/svc/meta/svc_unittests.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/svc_unittests"
+ }
+}
