commit 82089872a38a649d86564fca0ff6737022902c19
author Shai Barack <shayba@google.com> Wed Dec 23 05:23:16 2020 +0000
committer CQ Bot <commit-bot@chromium.org> Wed Dec 23 05:23:16 2020 +0000
tree 2fc62374af04525077295ee121c766c108d1ca00
parent 648e658140d5f9c77d20533217d4958ed5e94abc

[build] Remove usage of package.extra

Towards deprecation, BOOYAH

Change-Id: I29578ec92bb435ee63090463e2cb32b956a7f40f
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/464992
Commit-Queue: Shai Barack <shayba@google.com>
Fuchsia-Auto-Submit: Shai Barack <shayba@google.com>
Reviewed-by: P.Y. Laligand <pylaligand@google.com>

src/sys/lib/library_loader/BUILD.gn

diff --git a/src/sys/lib/library_loader/BUILD.gn b/src/sys/lib/library_loader/BUILD.gn
index b4ce7f9..cdef3b2 100644
--- a/src/sys/lib/library_loader/BUILD.gn
+++ b/src/sys/lib/library_loader/BUILD.gn
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/package.gni")
+import("//build/dist/resource.gni")
 import("//build/rust/rustc_library.gni")
-import("//build/test/test_package.gni")
 import("//build/testing/environments.gni")
+import("//src/sys/build/components.gni")
 
 rustc_library("library_loader") {
   version = "0.1.0"
@@ -34,30 +34,26 @@
 # files using OPEN_RIGHT_EXECUTABLE/VMO_FLAG_EXEC, and the easiest way to provide a test directory
 # that supports that is a real pkgfs directory.
 # TODO(fxbug.dev/37534): Remove this once Rust vfs supports OPEN_RIGHT_EXECUTABLE
-generate_manifest("config_test_files") {
-  args = [
-    "--entry=lib/config_test/foo=" +
-        rebase_path("config_test_files/foo", root_build_dir),
-    "--entry=lib/config_test/bar/baz=" +
-        rebase_path("config_test_files/bar/baz", root_build_dir),
-  ]
+resource("config_test_foo") {
+  sources = [ "config_test_files/foo" ]
+  outputs = [ "lib/config_test/foo" ]
 }
 
-test_package("library_loader_tests") {
+resource("config_test_bar_baz") {
+  sources = [ "config_test_files/bar/baz" ]
+  outputs = [ "lib/config_test/bar/baz" ]
+}
+
+fuchsia_unittest_package("library_loader_tests") {
   deps = [
-    ":config_test_files",
+    ":config_test_bar_baz",
+    ":config_test_foo",
     ":library_loader_test",
   ]
-
-  extra = get_target_outputs(":config_test_files")
-
-  tests = [
-    {
-      name = "library_loader_lib_test"
-      dest = "library_loader_tests"
-      environments = basic_envs
-    },
-  ]
+  manifest = "meta/library_loader_tests.cmx"
+  test_specs = {
+    environments = basic_envs
+  }
 }
 
 group("tests") {

src/sys/lib/library_loader/meta/library_loader_tests.cmx

diff --git a/src/sys/lib/library_loader/meta/library_loader_tests.cmx b/src/sys/lib/library_loader/meta/library_loader_tests.cmx
index e41c6945..e5c8b70 100644
--- a/src/sys/lib/library_loader/meta/library_loader_tests.cmx
+++ b/src/sys/lib/library_loader/meta/library_loader_tests.cmx
@@ -3,6 +3,6 @@
         "sdk/lib/diagnostics/syslog/client.shard.cmx"
     ],
     "program": {
-        "binary": "test/library_loader_tests"
+        "binary": "bin/library_loader_lib_test"
     }
 }