commit c5e65a950e98c1ca863862992ab31d9aecf85616
author Cameron Dale <camrdale@google.com> Thu Feb 11 15:44:39 2021 -0800
committer CQ Bot <commit-bot@chromium.org> Wed Feb 17 00:05:37 2021 +0000
tree 66addabfabb760408d5f043ff78c7a5adde28109
parent 0e1398c94ad9791b5de876438af8c377408c1d9b

[boringssl] Migrate to new build templates.

The crypto_test is now disabled by commenting it out, as the disabled flag is
not supported by the new templates. The build flag run_slow_bssl_tests
is removed as it is not used anywhere.

https: //fuchsia.dev/fuchsia-src/development/components/build#other_unsupported_features
Change-Id: I9afa23a3d52bc70b8586b13bd7367cf2b42c2606
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/boringssl/+/485464
Reviewed-by: Darren Krahn <dkrahn@google.com>
Commit-Queue: Cameron Dale <camrdale@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 89449ec..f1dbddb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -7,8 +7,7 @@
 import("BUILD.generated_tests.gni")
 
 if (is_fuchsia) {
-  import("//build/package.gni")
-  import("//build/test/test_package.gni")
+  import("//src/sys/build/components.gni")
 }
 
 declare_args() {
@@ -145,14 +144,8 @@
 # bssl command line tool #
 ##########################
 if (is_fuchsia) {
-  package("boringssl_tool") {
+  fuchsia_shell_package("boringssl_tool") {
     deps = [ ":bssl" ]
-    binaries = [
-      {
-        name = "bssl"
-        shell = true
-      },
-    ]
   }
 } else {
   group("boringssl_tool") {
@@ -192,25 +185,24 @@
 # Unit tests #
 ##############
 if (is_fuchsia) {
-  unittest_package("boringssl_tests") {
-    deps = [
-      ":crypto_test",
-      ":ssl_test",
+  fuchsia_unittest_component("crypto_test_component") {
+    deps = [ ":crypto_test" ]
+  }
+  fuchsia_unittest_component("ssl_test_component") {
+    deps = [ ":ssl_test" ]
+  }
+  fuchsia_test_package("boringssl_tests") {
+    test_components = [
+      ":ssl_test_component",
     ]
-    tests = [
-      {
-        name = "crypto_test"
 
-        # This test takes a long time to run, and it is included in every subset
-        # of the Fuchsia build.
-        # TODO(bgoldman): Find a way to skip this test when runtests is set to
-        # skip "large" tests.
-        disabled = !run_slow_bssl_tests
-      },
-      {
-        name = "ssl_test"
-      },
-    ]
+    # This test takes a long time to run, and it is included in every subset
+    # of the Fuchsia build.
+    # TODO(bgoldman): Find a way to skip this test when runtests is set to
+    # skip "large" tests.
+    if (run_slow_bssl_tests) {
+      test_components += [":crypto_test_component"]
+    }
   }
 }